diff options
| author | Jose <jose@zeroc.com> | 2016-05-09 23:31:16 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-09 23:31:16 +0200 |
| commit | 464ac5419aba884ee1783f5f67286a3c7aa72d3e (patch) | |
| tree | 75d53a81f5972f7969998bd40aa21c1ec26ed672 /cpp/src/IceGridLib | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-464ac5419aba884ee1783f5f67286a3c7aa72d3e.tar.bz2 ice-464ac5419aba884ee1783f5f67286a3c7aa72d3e.tar.xz ice-464ac5419aba884ee1783f5f67286a3c7aa72d3e.zip | |
Conflict fixes from previous commit
Diffstat (limited to 'cpp/src/IceGridLib')
| -rw-r--r-- | cpp/src/IceGridLib/PluginFacadeI.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp index 0b1748a852b..6bcd4f92358 100644 --- a/cpp/src/IceGridLib/PluginFacadeI.cpp +++ b/cpp/src/IceGridLib/PluginFacadeI.cpp @@ -18,7 +18,7 @@ using namespace IceGrid; namespace { -RegistryPluginFacade* pluginFacade = 0; +RegistryPluginFacadePtr pluginFacade; }; @@ -38,13 +38,5 @@ IceGrid::getRegistryPluginFacade() void IceGrid::setRegistryPluginFacade(const RegistryPluginFacadePtr& facade) { - if(pluginFacade) - { - pluginFacade->__decRef(); - } - pluginFacade = facade.get(); - if(pluginFacade) - { - pluginFacade->__incRef(); - } + pluginFacade = facade; } |