Commit 14ec6868 authored by Victor Poughon's avatar Victor Poughon

Merge branch 'cpp14_delete' into 'develop'

C++14: Replace comments by '= delete'

See merge request !133
parents fda0338e 902e99bc
...@@ -144,8 +144,8 @@ protected: ...@@ -144,8 +144,8 @@ protected:
~MyChangeDetectorImageFilter() override {} ~MyChangeDetectorImageFilter() override {}
private: private:
MyChangeDetectorImageFilter(const Self &); //purposely not implemented MyChangeDetectorImageFilter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
}; };
// Software Guide : EndCodeSnippet // Software Guide : EndCodeSnippet
......
...@@ -145,8 +145,8 @@ protected: ...@@ -145,8 +145,8 @@ protected:
} }
private: private:
ImageUniqueValuesCalculator(const Self&); //purposely not implemented ImageUniqueValuesCalculator(const Self&) = delete;
void operator=(const Self&); //purposely not implemented void operator=(const Self&) = delete;
ImageConstPointer m_Image; ImageConstPointer m_Image;
...@@ -460,8 +460,8 @@ protected: ...@@ -460,8 +460,8 @@ protected:
this->GetOutput()->SetNumberOfComponentsPerPixel( m_NumberOfOutputBands ); this->GetOutput()->SetNumberOfComponentsPerPixel( m_NumberOfOutputBands );
} }
private: private:
TernaryFunctorImageFilterWithNBands(const Self &); //purposely not implemented TernaryFunctorImageFilterWithNBands(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
unsigned int m_NumberOfOutputBands; unsigned int m_NumberOfOutputBands;
......
...@@ -74,8 +74,8 @@ protected: ...@@ -74,8 +74,8 @@ protected:
~CurlHelper() override {} ~CurlHelper() override {}
private: private:
CurlHelper(const Self &); //purposely not implemented CurlHelper(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
// Need to use our writing function to handle windows segfaults // Need to use our writing function to handle windows segfaults
// Need to be static cause the CURL_OPT is expecting a pure C // Need to be static cause the CURL_OPT is expecting a pure C
......
...@@ -69,8 +69,8 @@ protected: ...@@ -69,8 +69,8 @@ protected:
~CurlHelperInterface() override {} ~CurlHelperInterface() override {}
private: private:
CurlHelperInterface(const Self &); //purposely not implemented CurlHelperInterface(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
}; };
} }
......
...@@ -63,8 +63,8 @@ protected: ...@@ -63,8 +63,8 @@ protected:
~CurlHelperStub() override {} ~CurlHelperStub() override {}
private: private:
CurlHelperStub(const Self &); //purposely not implemented CurlHelperStub(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
}; };
......
...@@ -52,8 +52,8 @@ protected: ...@@ -52,8 +52,8 @@ protected:
~DEMConvertAdapter() override; ~DEMConvertAdapter() override;
private: private:
DEMConvertAdapter(const Self &); //purposely not implemented DEMConvertAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
}; };
} // namespace otb } // namespace otb
......
...@@ -88,8 +88,8 @@ protected: ...@@ -88,8 +88,8 @@ protected:
~DateTimeAdapter() override; ~DateTimeAdapter() override;
private: private:
DateTimeAdapter(const Self &); //purposely not implemented DateTimeAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
ossimLocalTm *m_LocalTm; ossimLocalTm *m_LocalTm;
......
...@@ -70,8 +70,8 @@ protected: ...@@ -70,8 +70,8 @@ protected:
~EllipsoidAdapter() override; ~EllipsoidAdapter() override;
private: private:
EllipsoidAdapter(const Self &); //purposely not implemented EllipsoidAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
ossimEllipsoid* m_Ellipsoid; ossimEllipsoid* m_Ellipsoid;
}; };
......
...@@ -109,8 +109,8 @@ protected: ...@@ -109,8 +109,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const override; void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private: private:
FilterFunctionValues(const Self &); //purposely not implemented FilterFunctionValues(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
/** Vector that contains the filter function value. */ /** Vector that contains the filter function value. */
ValuesVectorType m_FilterFunctionValues; ValuesVectorType m_FilterFunctionValues;
......
...@@ -81,8 +81,8 @@ protected: ...@@ -81,8 +81,8 @@ protected:
~GeometricSarSensorModelAdapter() override; ~GeometricSarSensorModelAdapter() override;
private: private:
GeometricSarSensorModelAdapter(const Self &); //purposely not implemented GeometricSarSensorModelAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
ossimplugins::ossimGeometricSarSensorModel* m_SensorModel; ossimplugins::ossimGeometricSarSensorModel* m_SensorModel;
......
...@@ -152,7 +152,7 @@ private: ...@@ -152,7 +152,7 @@ private:
// char m_Delimiter; // char m_Delimiter;
// void operator=(const Self&); //purposely not implemented // void operator=(const Self&) = delete;
}; };
......
...@@ -92,8 +92,8 @@ protected: ...@@ -92,8 +92,8 @@ protected:
~MapProjectionAdapter() override; ~MapProjectionAdapter() override;
private: private:
MapProjectionAdapter(const Self &); //purposely not implemented MapProjectionAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
void ApplyParametersToProjection(); void ApplyParametersToProjection();
......
...@@ -81,8 +81,8 @@ protected: ...@@ -81,8 +81,8 @@ protected:
~PlatformPositionAdapter() override; ~PlatformPositionAdapter() override;
private: private:
PlatformPositionAdapter(const Self &); //purposely not implemented PlatformPositionAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
ossimplugins::ossimGeometricSarSensorModel* m_SensorModel; ossimplugins::ossimGeometricSarSensorModel* m_SensorModel;
......
...@@ -79,12 +79,12 @@ public: ...@@ -79,12 +79,12 @@ public:
private: private:
RPCSolverAdapter(const Self &); //purposely not implemented RPCSolverAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
RPCSolverAdapter(); // purposely not implemented, this class defines
// typedefs and exposes static methods // This class defines typedefs and exposes static methods
virtual ~RPCSolverAdapter(); // purposely not implemented, this class defines RPCSolverAdapter() = delete;
// typedefs and exposes static methods virtual ~RPCSolverAdapter() = delete;
}; };
} // namespace otb } // namespace otb
......
...@@ -109,8 +109,8 @@ protected: ...@@ -109,8 +109,8 @@ protected:
virtual ~SarSensorModelAdapter() override; virtual ~SarSensorModelAdapter() override;
private: private:
SarSensorModelAdapter(const Self &); //purposely not implemented SarSensorModelAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
InternalModelPointer m_SensorModel; InternalModelPointer m_SensorModel;
}; };
......
...@@ -114,8 +114,8 @@ protected: ...@@ -114,8 +114,8 @@ protected:
~SensorModelAdapter() override; ~SensorModelAdapter() override;
private: private:
SensorModelAdapter(const Self &); //purposely not implemented SensorModelAdapter(const Self &) = delete;
void operator =(const Self&); //purposely not implemented void operator =(const Self&) = delete;
InternalMapProjectionPointer m_SensorModel; InternalMapProjectionPointer m_SensorModel;
......
...@@ -44,12 +44,6 @@ ...@@ -44,12 +44,6 @@
namespace otb namespace otb
{ {
RPCSolverAdapter::RPCSolverAdapter()
{}
RPCSolverAdapter::~RPCSolverAdapter()
{}
void void
RPCSolverAdapter::Solve(const GCPsContainerType& gcpContainer, RPCSolverAdapter::Solve(const GCPsContainerType& gcpContainer,
double& rmsError, double& rmsError,
......
...@@ -102,8 +102,8 @@ protected: ...@@ -102,8 +102,8 @@ protected:
~ComplexToIntensityImageFilter() override {} ~ComplexToIntensityImageFilter() override {}
private: private:
ComplexToIntensityImageFilter(const Self&); //purposely not implemented ComplexToIntensityImageFilter(const Self&) = delete;
void operator=(const Self&); //purposely not implemented void operator=(const Self&) = delete;
}; };
......
...@@ -165,8 +165,8 @@ protected: ...@@ -165,8 +165,8 @@ protected:
} }
private: private:
ComplexToVectorImageCastFilter(const Self&); //purposely not implemented ComplexToVectorImageCastFilter(const Self&) = delete;
void operator=(const Self&); //purposely not implemented void operator=(const Self&) = delete;