Merge lp:~michihenning/unity-scopes-api/miscellaneous-fixes into lp:unity-scopes-api
Status: | Merged |
---|---|
Approved by: | Marcus Tomlinson |
Approved revision: | 278 |
Merged at revision: | 284 |
Proposed branch: | lp:~michihenning/unity-scopes-api/miscellaneous-fixes |
Merge into: | lp:unity-scopes-api |
Prerequisite: | lp:~marcustomlinson/unity-scopes-api/lp-1410125 |
Diff against target: |
295 lines (+40/-24) 21 files modified
CMakeLists.txt (+10/-7) HACKING (+1/-1) demo/CMakeLists.txt (+3/-1) demo/scopes/scope-A/CMakeLists.txt (+2/-0) demo/scopes/scope-B/CMakeLists.txt (+1/-0) demo/scopes/scope-C/CMakeLists.txt (+1/-0) demo/scopes/scope-D/CMakeLists.txt (+1/-0) demo/scopes/scope-N/CMakeLists.txt (+1/-0) demo/scopes/scope-S/CMakeLists.txt (+1/-0) demo/stand-alone/CMakeLists.txt (+3/-1) doc/Doxyfile-devel.in (+1/-1) include/unity/scopes/Category.h (+1/-1) include/unity/scopes/internal/CategoryRegistry.h (+5/-3) include/unity/scopes/internal/smartscopes/SSScopeObject.h (+3/-3) src/scopes/internal/JsonCppNode.cpp (+1/-1) src/scopes/internal/Logger.cpp (+1/-1) src/scopes/internal/QueryCtrlImpl.cpp (+0/-1) src/scopes/internal/ReplyImpl.cpp (+1/-1) src/scopes/internal/ScopeBaseImpl.cpp (+1/-0) src/scopes/internal/SearchMetadataImpl.cpp (+1/-1) src/scopes/utility/internal/BufferedResultForwarderImpl.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~michihenning/unity-scopes-api/miscellaneous-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marcus Tomlinson (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+246387@code.launchpad.net |
This proposal supersedes a proposal from 2015-01-14.
Commit message
Bunch of miscellaneous fixes:
- Added warning for non-virtual destructors.
- Warnings will disappear once Marcus's child_scopes branch is merged.
- Tidied up the way compiler flags are set in CMakeLists.txt for clarity.
- Added missing dependencies to demos, so we can't run with an out-of-date registry or scoperunner.
- Fixed a number of warnings when building the developer doc.
- Minor doc fixes.
- Minor stylistic code fixes.
- Added missing tmp_dir_
- Removed redundant lock in QueryCtrlImpl constructor.
Description of the change
These are fixes that I picked up from the branches that went on hold because of the ABI break, but that contained other unrelated fixes.
Main change is that we now get a warning for non-virtual base class constructors. The warnings will disappear once Marcus's child_scopes branch is merged. The other fixes are all minor, except for the missing tmp_dir_
Bunch of miscellaneous fixes:
- Added warning for non-virtual destructors.
- Tidied up the way compiler flags are set in CMakeLists.txt for clarity.
- Added missing dependencies to demos, so we can't run with an out-of-date registry or scoperunner.
- Fixed a number of warnings when building the developer doc.
- Minor doc fixes.
- Minor stylistic code fixes.
- Added missing tmp_dir_
- Removed redundant lock in QueryCtrlImpl constructor.
FAILED: Continuous integration, rev:276 jenkins. qa.ubuntu. com/job/ unity-scopes- api-ci/ 508/ jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- amd64-ci/ 33/console jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- armhf-ci/ 33/console jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- i386-ci/ 33/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scopes- api-ci/ 508/rebuild
http://