5 files changed, 6 insertions, 6 deletions
diff --git a/cpp/managementgen/generate.py b/cpp/managementgen/generate.py
index 197deec4f1..6024173f67 100755
--- a/cpp/managementgen/generate.py
+++ b/cpp/managementgen/generate.py
@@ -158,7 +158,8 @@ class Generator:
       raise ValueError ("path is not directory: %s" % path)
     if not exists:
       pair = os.path.split (path)
-      self.createPath (pair[0])
+      if pair[0] != '':
+        self.createPath (pair[0])
       os.mkdir (path)
 
   def normalize (self, path):
diff --git a/cpp/managementgen/templates/Class.cpp b/cpp/managementgen/templates/Class.cpp
index 100e306fe0..289427d742 100644
--- a/cpp/managementgen/templates/Class.cpp
+++ b/cpp/managementgen/templates/Class.cpp
@@ -23,7 +23,7 @@
 #include "qpid/log/Statement.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/management/Manageable.h" 
-#include "qpid/management/ManagementAgent.h"
+#include "qpid/agent/ManagementAgent.h"
 #include "/*MGEN:Class.NameCap*/.h"
 /*MGEN:Class.MethodArgIncludes*/
 
diff --git a/cpp/managementgen/templates/Class.h b/cpp/managementgen/templates/Class.h
index 557c7a45d5..8a4dc1006a 100644
--- a/cpp/managementgen/templates/Class.h
+++ b/cpp/managementgen/templates/Class.h
@@ -79,7 +79,6 @@ class /*MGEN:Class.NameCap*/ : public ManagementObject
   public:
 
     friend class Package/*MGEN:Class.NamePackageCap*/;
-    typedef boost::shared_ptr</*MGEN:Class.NameCap*/> shared_ptr;
 
     /*MGEN:Class.NameCap*/ (ManagementAgent* agent,
                             Manageable* coreObject/*MGEN:Class.ParentArg*//*MGEN:Class.ConstructorArgs*/);
diff --git a/cpp/managementgen/templates/Package.cpp b/cpp/managementgen/templates/Package.cpp
index 0c5af8d71d..8bb2d42c47 100644
--- a/cpp/managementgen/templates/Package.cpp
+++ b/cpp/managementgen/templates/Package.cpp
@@ -25,7 +25,7 @@
 
 using namespace qpid::management;
 
-Package/*MGEN:Schema.PackageNameCap*/::Package/*MGEN:Schema.PackageNameCap*/ (ManagementAgent::shared_ptr agent)
+Package/*MGEN:Schema.PackageNameCap*/::Package/*MGEN:Schema.PackageNameCap*/ (ManagementAgent* agent)
 {
 /*MGEN:Schema.ClassRegisters*/
 }
diff --git a/cpp/managementgen/templates/Package.h b/cpp/managementgen/templates/Package.h
index 214f811a1f..3f3ac35ffc 100644
--- a/cpp/managementgen/templates/Package.h
+++ b/cpp/managementgen/templates/Package.h
@@ -23,7 +23,7 @@
 
 /*MGEN:Root.Disclaimer*/
 
-#include "qpid/management/ManagementAgent.h"
+#include "qpid/agent/ManagementAgent.h"
 
 namespace qpid {
 namespace management {
@@ -31,7 +31,7 @@ namespace management {
 class Package/*MGEN:Schema.PackageNameCap*/
 {
   public:
-    Package/*MGEN:Schema.PackageNameCap*/ (ManagementAgent::shared_ptr agent);
+    Package/*MGEN:Schema.PackageNameCap*/ (ManagementAgent* agent);
     ~Package/*MGEN:Schema.PackageNameCap*/ () {}
 };