Merge lp:~hikiko/mir/mir.fix-virt-destructorS into lp:~mir-team/mir/trunk
Proposed by
Eleni Maria Stea
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Kevin DuBois | ||||
Proposed branch: | lp:~hikiko/mir/mir.fix-virt-destructorS | ||||
Merge into: | lp:~mir-team/mir/trunk | ||||
Diff against target: |
558 lines (+62/-25) (has conflicts) 39 files modified
3rd_party/cucumber-cpp/CTestTestfile.cmake (+2/-3) 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp (+2/-0) 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp (+1/-0) 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp (+2/-0) 3rd_party/cucumber-cpp/src/CTestTestfile.cmake (+2/-2) 3rd_party/cucumber-cpp/src/connectors/wire/WireProtocol.cpp (+1/-0) 3rd_party/cucumber-cpp/tests/CTestTestfile.cmake (+2/-2) 3rd_party/cucumber-cpp/tests/utils/DriverTestRunner.hpp (+1/-0) 3rd_party/gmock-1.6.0/gtest/fused-src/gtest/gtest.h (+2/-1) 3rd_party/gmock-1.6.0/gtest/include/gtest/internal/gtest-param-util.h (+2/-1) 3rd_party/gmock-1.6.0/include/gmock/gmock-actions.h (+1/-1) 3rd_party/gmock-1.6.0/include/gmock/gmock-matchers.h (+1/-1) CMakeLists.txt (+1/-1) include/server/mir/compositor/buffer_allocation_strategy.h (+1/-2) include/server/mir/compositor/buffer_bundle_surfaces.h (+1/-1) include/server/mir/frontend/session_mediator_report.h (+2/-0) include/server/mir/graphics/display.h (+1/-1) include/server/mir/graphics/display_report.h (+1/-1) include/server/mir/graphics/platform.h (+2/-0) include/server/mir/graphics/viewable_area.h (+1/-1) include/server/mir/options/option.h (+1/-1) include/server/mir/server_configuration.h (+1/-1) include/server/mir/surfaces/buffer_bundle.h (+2/-0) include/test/mir_test_doubles/mock_android_alloc_device.h (+1/-0) include/test/mir_test_framework/testing_process_manager.h (+1/-0) src/client/android/android_client_buffer.cpp (+4/-0) src/client/android/android_registrar.h (+2/-0) src/client/client_platform.h (+2/-0) src/client/rpc/mir_basic_rpc_channel.h (+1/-1) src/client/rpc/mir_socket_rpc_channel.h (+6/-0) src/server/frontend/message_processor.h (+2/-2) src/server/frontend/socket_session.cpp (+0/-1) src/server/graphics/gbm/gbm_display.cpp (+1/-0) src/server/graphics/gbm/gbm_platform.cpp (+0/-1) tests/integration-tests/compositor/multithread_harness.h (+3/-0) tests/unit-tests/client/android/test_client_android_registrar.cpp (+2/-0) tests/unit-tests/client/test_mir_connection.cpp (+2/-0) tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp (+1/-0) tests/unit-tests/test_gmock_fixes.cpp (+1/-0) Text conflict in src/client/rpc/mir_socket_rpc_channel.h |
||||
To merge this branch: | bzr merge lp:~hikiko/mir/mir.fix-virt-destructorS | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Needs Fixing | ||
Daniel van Vugt | Needs Fixing | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
Added virtual destructors where missing. It's a cleanup of this branch:
https:/
for this bug:
https:/
Description of the change
Added virtual destructors where missing. It's a cleanup of this branch:
https:/
for this bug:
https:/
To post a comment you must log in.
I replaced the default destructors with virtual ~Foo () { /*TODO: make nothrow*/ } because of this: http:// stackoverflow. com/questions/ 11497252/ default- destructor- nothrow after a discussion with Alan