From d67670b533a121afdd1508d8d6cd26eceaaa0b76 Mon Sep 17 00:00:00 2001
From: Victor Poughon <victor.poughon@cnes.fr>
Date: Thu, 18 Oct 2018 14:58:54 +0200
Subject: [PATCH] BUG: make ossimPluginReaderFactory non copyable
---
.../src/ossim/ossimPluginReaderFactory.cpp | 11 +----------
.../src/ossim/ossimPluginReaderFactory.h | 16 ++++++++--------
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPluginReaderFactory.cpp
index 1046d4fee9..bc3c02047a 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 b7c7d493a4..df9454f788 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 */
--
GitLab