diff options
| author | Ted Ross <tross@apache.org> | 2012-11-30 19:17:28 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-11-30 19:17:28 +0000 |
| commit | df3fd9dedb97d5e9932c9e56c024459c89d46dee (patch) | |
| tree | 5b7543a2ee6d2e34f869f09ef8b9355b83b8461c /cpp/src/qpid/broker/Bridge.cpp | |
| parent | a4be64d80bfa5517250e1e16becb2f951b440c3f (diff) | |
| download | qpid-python-df3fd9dedb97d5e9932c9e56c024459c89d46dee.tar.gz | |
QPID-4449 - Reverted much of the original change and re-implemented the fix in a simpler way.
The build-define _IN_QPID_BROKER is now used for modules built in the broker. The shared-pointer
changes are conditionally compiled only for in-broker cases.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1415796 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Bridge.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Bridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/Bridge.cpp b/cpp/src/qpid/broker/Bridge.cpp index 90cb1a79ed..6d3894d65f 100644 --- a/cpp/src/qpid/broker/Bridge.cpp +++ b/cpp/src/qpid/broker/Bridge.cpp @@ -298,7 +298,7 @@ uint32_t Bridge::encodedSize() const + 2; // sync } -management::ManagementObject::shared_ptr Bridge::GetManagementObjectShared (void) const +management::ManagementObject::shared_ptr Bridge::GetManagementObject(void) const { return mgmtObject; } |