From 89d54e2629650f8967be3ec9f7a788bf41aadf70 Mon Sep 17 00:00:00 2001 From: Julien Michel Date: Fri, 17 Apr 2015 16:58:40 +0200 Subject: [PATCH] COMP: Remove itkTypeMacro (not an itk derived object) and use the GenericExceptionMacro accordingly --- Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h | 3 --- Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h b/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h index c4896159bb..a21dc62831 100644 --- a/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h +++ b/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h @@ -82,9 +82,6 @@ public: typedef std::map KeywordlistMap; - /** Run-time type information (and related methods). */ - itkTypeMacro(ImageKeywordlist, ImageKeywordlist); - /** Get the internal map container */ const KeywordlistMap& GetKeywordlist() const { diff --git a/Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx b/Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx index ef4a9ce607..930da01a75 100644 --- a/Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx +++ b/Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx @@ -90,7 +90,7 @@ GetMetadataByKey(const std::string& key) const // If the key can not be found, throw an exception if (it == m_Keywordlist.end()) { - itkExceptionMacro(<< "Keywordlist has no output with key " << key); + itkGenericExceptionMacro(<< "Keywordlist has no output with key " << key); } // Then if everything is ok, return the ossinString -- GitLab