1 files changed, 12 insertions, 5 deletions
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index fd69639ee75..381e4fd8eb3 100644
--- a/cpp/src/IceGridLib/PluginFacadeI.cpp
+++ b/cpp/src/IceGridLib/PluginFacadeI.cpp
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_API_EXPORTS
-#   define ICE_GRID_API_EXPORTS
+#ifndef ICEGRID_API_EXPORTS
+#   define ICEGRID_API_EXPORTS
 #endif
 
 #include <IceGrid/IceGrid.h>
@@ -18,14 +18,17 @@ using namespace IceGrid;
 namespace
 {
 
+#ifdef ICE_CPP11_MAPPING
+std::shared_ptr<RegistryPluginFacade> pluginFacade;
+#else
 RegistryPluginFacade* pluginFacade = 0;
-
-};
+#endif
+}
 
 namespace IceGrid
 {
 
-ICE_GRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
+ICEGRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
 
 };
 
@@ -38,6 +41,9 @@ IceGrid::getRegistryPluginFacade()
 void
 IceGrid::setRegistryPluginFacade(const RegistryPluginFacadePtr& facade)
 {
+#ifdef ICE_CPP11_MAPPING
+    pluginFacade = facade;
+#else
     if(pluginFacade)
     {
         pluginFacade->__decRef();
@@ -47,4 +53,5 @@ IceGrid::setRegistryPluginFacade(const RegistryPluginFacadePtr& facade)
     {
         pluginFacade->__incRef();
     }
+#endif
 }