lp://staging/~unity-api-team/unity-scopes-api/gcc-5-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/unity-scopes-api at revision 341

PS Jenkins bot (community): Approve (continuous-integration) on 2015-07-24

Marcus Tomlinson (community): Approve on 2015-07-24

Diff: 96 lines (+21/-22)

4 files modified

debian/control (+1/-2)
src/scopes/internal/SearchReplyImpl.cpp (+2/-2)
test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt (+16/-16)
test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+2/-2)

api

Superseded for merging into lp://staging/unity-scopes-api/devel

PS Jenkins bot (community): Approve (continuous-integration) on 2015-07-24

Unity Team: Pending requested 2015-07-24

Diff: 1678 lines (+17/-1604)

7 files modified

HACKING (+0/-22)
debian/control (+1/-2)
debian/libunity-scopes-qt.symbols (+0/-314)
debian/libunity-scopes3.symbols (+0/-1107)
test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt (+16/-16)
tools/CMakeLists.txt (+0/-1)
tools/symbol_diff.in (+0/-142)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

620. By Marcus Tomlinson on 2015-07-24

Reverted symbols removal

619. By Michi Henning on 2015-07-24

Updated standards version to 3.9.6 in debian/control.

618. By Michi Henning on 2015-07-24

Removed copyonely from configure() calls because
cmake 3.2.2 doesn't like it. Removed symbols
file and associated tools. Removed g++ dependency
from debian/control because bzr bd emitted a warning.

617. By Michi Henning on 2015-07-23

Fixed bug exposed by non-COW string implementation in gcc 5.

616. By Michi Henning on 2015-07-22

Fixed compile-time error with boost 1.58, which still has incorrect concept checking for range iterators.

615. By Marcus Tomlinson on 2015-07-21

Merged trunk

614. By Paweł Stołowski on 2015-07-14

Handle int64_t when converting between variant to json and vice versa. Fixes: https://bugs.launchpad.net/bugs/1473404.

Approved by Marcus Tomlinson, PS Jenkins bot.

613. By Paweł Stołowski on 2015-07-14

Check both nsec and sec when checking for settings file change. Removed TRY_EXPECT* macros.

Approved by Marcus Tomlinson, PS Jenkins bot.

612. By Paweł Stołowski on 2015-07-09

SettingsDB: fall back to seconds of stat structure if nanoseconds are not available; this may be the case with filesystems which do not support such precision (e.g. ext3). ext4 does support nanoseconds.

Approved by PS Jenkins bot, Marcus Tomlinson.

611. By Paweł Stołowski on 2015-07-09

Merged trunk