diff options
| author | Alan Conway <aconway@apache.org> | 2016-06-22 20:41:49 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2016-06-22 20:41:49 +0000 |
| commit | e1d9be1b3590c79a0b2a6b6ad4cd3e6a65877401 (patch) | |
| tree | cde644dcbd8add2d60863e71bc9063604911fdb0 /qpid/cpp/src/legacystore.cmake | |
| parent | c3c3bc4016270dd75b4c6a1e6831408cd4a5d055 (diff) | |
| download | qpid-python-e1d9be1b3590c79a0b2a6b6ad4cd3e6a65877401.tar.gz | |
QPID-7306: Conditional compile mismatch in broker and common libs.
Removed _IN_QPID_BROKER compile definition:
Inconsistently set for libqpidcommon (compiled .cpp files) and libqpidbroker (uses .h) files
- The broker has a binary incompatible notion of what is in the library.
It sort-of works by accident:
- shared_ptr<T> only contains a T*, the mismatch is effectively doing reinterpret_cast<T*>
- plain T* works for op->, but doesn't guarantee no concurrent deletes.
- we create and destroy shared_ptr in libraries with _IN_QPID_BROKER set so
we get cleanup, and no cores if we're lucky but there is limited protection from races.
Was only used by management:
- I think exposing non-shared ptr GetObject was a feature that never materialized,
- if not we need a separate function or class for non-shared-ptr users.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1749781 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/legacystore.cmake')
| -rw-r--r-- | qpid/cpp/src/legacystore.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/legacystore.cmake b/qpid/cpp/src/legacystore.cmake index 3cb1171b00..ef5df28c41 100644 --- a/qpid/cpp/src/legacystore.cmake +++ b/qpid/cpp/src/legacystore.cmake @@ -115,7 +115,7 @@ if (BUILD_LEGACYSTORE) qpid/legacystore/TxnCtxt.cpp ) - set (legacystore_defines _IN_QPID_BROKER RHM_CLEAN) + set (legacystore_defines RHM_CLEAN) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/db-inc.h) message(STATUS "Including BDB from ${DB_CXX_INCLUDE_DIR}/db_cxx.h") |