diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.cpp index 1046d4fee9e10ab11be7fd03d4cf50dfe74094ba..bc3c02047a4824fc0c3275076f1a06485e083c1e 100644 --- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.cpp +++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.cpp @@ -47,7 +47,7 @@ namespace ossimplugins ossimPluginReaderFactory::~ossimPluginReaderFactory() { - theInstance = 0; + theInstance = nullptr; } ossimPluginReaderFactory* ossimPluginReaderFactory::instance() @@ -179,13 +179,4 @@ namespace ossimplugins { extensionList.push_back(ossimString("xml")); } - - ossimPluginReaderFactory::ossimPluginReaderFactory(){} - - ossimPluginReaderFactory::ossimPluginReaderFactory(const ossimPluginReaderFactory& rhs) - : ossimImageHandlerFactoryBase(rhs) - { - } - - void ossimPluginReaderFactory::operator=(const ossimPluginReaderFactory&){} } diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.h index b7c7d493a41f718960a1cb86e6c29bde90c7319c..df9454f78893a456fce43395610e8a62e2677038 100644 --- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.h +++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.h @@ -97,21 +97,21 @@ namespace ossimplugins virtual void getSupportedExtensions( ossimImageHandlerFactoryBase::UniqueStringList& extensionList)const; - protected: - /** @brief hidden from use default constructor */ - ossimPluginReaderFactory(); + /** @brief deleted copy constructor */ + ossimPluginReaderFactory(const ossimPluginReaderFactory&) = delete; - /** @brief hidden from use copy constructor */ - ossimPluginReaderFactory(const ossimPluginReaderFactory&); + /** @brief deleted copy assignment operator */ + void operator=(const ossimPluginReaderFactory&) = delete; - /** @brief hidden from use copy constructor */ - void operator=(const ossimPluginReaderFactory&); + protected: + /** @brief hidden from use default constructor */ + ossimPluginReaderFactory() {} /** static instance of this class */ static ossimPluginReaderFactory* theInstance; TYPE_DATA - }; + }; } #endif /* end of #ifndef ossimPluginReaderFactory_HEADER */