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 | acbde11b61d7bb3a0cdd81e1201d8565a4cbdfbd (patch) | |
| tree | 8b44f678894995ebe98deb128e407e6d80946668 /qpid/cpp/managementgen | |
| parent | 67dd5f7e03147e1e145f8d063b7b443ede02bb2e (diff) | |
| download | qpid-python-acbde11b61d7bb3a0cdd81e1201d8565a4cbdfbd.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@1415796 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/managementgen')
| -rwxr-xr-x | qpid/cpp/managementgen/qmfgen/schema.py | 8 | ||||
| -rw-r--r-- | qpid/cpp/managementgen/qmfgen/templates/Class.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/qpid/cpp/managementgen/qmfgen/schema.py b/qpid/cpp/managementgen/qmfgen/schema.py index cfbc88f7a9..7bf161dc2b 100755 --- a/qpid/cpp/managementgen/qmfgen/schema.py +++ b/qpid/cpp/managementgen/qmfgen/schema.py @@ -1523,12 +1523,8 @@ class SchemaClass: def genParentRefAssignment (self, stream, variables): for config in self.properties: if config.isParentRef == 1: - if variables['genForBroker']: - stream.write (config.getName () + \ - " = _parent->GetManagementObjectShared()->getObjectId ();") - else: - stream.write (config.getName () + \ - " = _parent->GetManagementObject()->getObjectId ();") + stream.write (config.getName () + \ + " = _parent->GetManagementObject()->getObjectId();") return def genSchemaMD5 (self, stream, variables): diff --git a/qpid/cpp/managementgen/qmfgen/templates/Class.h b/qpid/cpp/managementgen/qmfgen/templates/Class.h index 362d268aba..cd43cef7f4 100644 --- a/qpid/cpp/managementgen/qmfgen/templates/Class.h +++ b/qpid/cpp/managementgen/qmfgen/templates/Class.h @@ -26,6 +26,7 @@ #include "qpid/management/ManagementObject.h" /*MGEN:IF(Root.InBroker)*/ #include "qmf/BrokerImportExport.h" +#include <boost/shared_ptr.hpp> /*MGEN:ENDIF*/ #include <limits> @@ -79,7 +80,9 @@ namespace qmf { void aggregatePerThreadStats(struct PerThreadStats*) const; /*MGEN:ENDIF*/ public: +/*MGEN:IF(Root.InBroker)*/ typedef boost::shared_ptr</*MGEN:Class.NameCap*/> shared_ptr; +/*MGEN:ENDIF*/ /*MGEN:Root.ExternMethod*/ static void writeSchema(std::string& schema); /*MGEN:Root.ExternMethod*/ void mapEncodeValues(::qpid::types::Variant::Map& map, |