From bd10f9d05de8c77f032a1f49b433e3434718ac9e Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Fri, 30 Nov 2012 19:17:28 +0000 Subject: 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 --- cpp/managementgen/qmfgen/schema.py | 8 ++------ cpp/managementgen/qmfgen/templates/Class.h | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'cpp/managementgen') diff --git a/cpp/managementgen/qmfgen/schema.py b/cpp/managementgen/qmfgen/schema.py index cfbc88f7a9..7bf161dc2b 100755 --- a/cpp/managementgen/qmfgen/schema.py +++ b/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/cpp/managementgen/qmfgen/templates/Class.h b/cpp/managementgen/qmfgen/templates/Class.h index 362d268aba..cd43cef7f4 100644 --- a/cpp/managementgen/qmfgen/templates/Class.h +++ b/cpp/managementgen/qmfgen/templates/Class.h @@ -26,6 +26,7 @@ #include "qpid/management/ManagementObject.h" /*MGEN:IF(Root.InBroker)*/ #include "qmf/BrokerImportExport.h" +#include /*MGEN:ENDIF*/ #include @@ -79,7 +80,9 @@ namespace qmf { void aggregatePerThreadStats(struct PerThreadStats*) const; /*MGEN:ENDIF*/ public: +/*MGEN:IF(Root.InBroker)*/ typedef boost::shared_ptr shared_ptr; +/*MGEN:ENDIF*/ /*MGEN:Root.ExternMethod*/ static void writeSchema(std::string& schema); /*MGEN:Root.ExternMethod*/ void mapEncodeValues(::qpid::types::Variant::Map& map, -- cgit v1.2.1