From 088929dca6c1d4b006658e5616ea88128a27cc83 Mon Sep 17 00:00:00 2001
From: Ludovic Hussonnois <ludovic.hussonnois@c-s.fr>
Date: Wed, 19 Apr 2017 10:15:36 +0100
Subject: [PATCH] Revert "REFAC: add ITK_DELETE_FUNCTION."
This reverts commit 9bd559054abb92a4f66993c646478838906499cc.
---
Modules/Learning/Unsupervised/include/otbContingencyTable.h | 4 ++--
.../Unsupervised/include/otbContingencyTableCalculator.h | 4 ++--
.../Unsupervised/include/otbSharkKMeansMachineLearningModel.h | 4 ++--
.../include/otbSharkKMeansMachineLearningModelFactory.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTable.h b/Modules/Learning/Unsupervised/include/otbContingencyTable.h
index f9e3c9317d..20234cd074 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTable.h
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTable.h
@@ -144,8 +144,8 @@ protected:
}
private:
- ContingencyTable(const Self &) ITK_DELETE_FUNCTION; //purposely not implemented
- void operator=(const Self &) ITK_DELETE_FUNCTION; //purposely not implemented
+ ContingencyTable(const Self &); //purposely not implemented
+ void operator=(const Self &); //purposely not implemented
static size_t GetLabelsMaximumLength(const LabelList& labels, size_t maxWidth)
{
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
index 328696c4e3..b8d8d924af 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
@@ -87,8 +87,8 @@ protected:
//void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
- ContingencyTableCalculator(const Self &) ITK_DELETE_FUNCTION; //purposely not implemented
- void operator=(const Self &) ITK_DELETE_FUNCTION; //purposely not implemented
+ ContingencyTableCalculator(const Self &); //purposely not implemented
+ void operator=(const Self &); //purposely not implemented
MapOfClassesType m_LabelCount;
unsigned long m_NumberOfRefClasses;
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
index 22389a904b..3084b2503e 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
@@ -142,8 +142,8 @@ protected:
void PrintSelf(std::ostream &os, itk::Indent indent) const;
private:
- SharkKMeansMachineLearningModel(const Self &) ITK_DELETE_FUNCTION; //purposely not implemented
- void operator=(const Self &) ITK_DELETE_FUNCTION; //purposely not implemented
+ SharkKMeansMachineLearningModel(const Self &); //purposely not implemented
+ void operator=(const Self &); //purposely not implemented
// Parameters set by the user
bool m_Normalized;
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
index 5ef843d4d8..a072d5d719 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
@@ -62,8 +62,8 @@ protected:
virtual ~SharkKMeansMachineLearningModelFactory();
private:
- SharkKMeansMachineLearningModelFactory(const Self &) ITK_DELETE_FUNCTION; //purposely not implemented
- void operator =(const Self&) ITK_DELETE_FUNCTION; //purposely not implemented
+ SharkKMeansMachineLearningModelFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
--
GitLab