Commit eb259c64 authored by Laurentiu Nicola's avatar Laurentiu Nicola

ENH: Use std instead of vcl headers

find \( -name "*.hxx" -or -name "*.h" -or -name "*.cxx" \) -not -path "*ThirdParty*" -print0 | xargs -0 sed -sri "s/vcl_(algorithm|complex|cmath)\.h/\1/g"

find \( -name "*.hxx" -or -name "*.h" -or -name "*.cxx" \) -not -path "*ThirdParty*" -print0 | xargs -0 sed -sri "s/std::complex\.h/complex/g"

find \( -name "*.hxx" -or -name "*.h" -or -name "*.cxx" \) -not -path "*ThirdParty*" -print0 | xargs -0 sed -sri 's/#include "(algorithm|cmath|complex)"/#include <\1>/g'
parent fcbf830b
......@@ -35,7 +35,7 @@
#include "otbImportGeoInformationImageFilter.h"
#include <time.h>
#include <vcl_algorithm.h>
#include <algorithm>
#include "otbWrapperApplication.h"
#include "otbWrapperApplicationFactory.h"
......
......@@ -30,7 +30,7 @@
#include "otbTileImageFilter.h"
#include <time.h>
#include <vcl_algorithm.h>
#include <algorithm>
#include <climits>
#include "otbWrapperApplication.h"
......
......@@ -29,7 +29,7 @@
#include "otbOGRFeatureWrapper.h"
#include <time.h>
#include <vcl_algorithm.h>
#include <algorithm>
namespace otb
{
......
......@@ -28,7 +28,7 @@
* All mathematics constans, functions (used in the OTB code) are the vcl version (vcl..., CONST_PI, ).
*/
#include "vcl_cmath.h"
#include <cmath>
namespace otb {
......@@ -37,7 +37,7 @@ namespace otb {
#define _MATH_DEFINES_DEFINED
#endif
/** Define constants if not define in the "vcl_cmath.h" */
/** Define constants if not define in the "cmath" */
/* Some useful constants. */
const double CONST_E = 2.7182818284590452354; /* e */
......
......@@ -22,7 +22,7 @@
#define otbPolarimetricSynthesisFunctor_h
#include "otbMath.h"
#include "std::complex.h"
#include <complex>
#include "itkFixedArray.h"
namespace otb
......
......@@ -23,7 +23,7 @@
#define otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter_h
#include "itkUnaryFunctorImageFilter.h"
#include "std::complex.h"
#include <complex>
namespace otb
{
......
......@@ -21,7 +21,7 @@
#ifndef otbSinclairToCircularCovarianceMatrixFunctor_h
#define otbSinclairToCircularCovarianceMatrixFunctor_h
#include "std::complex.h"
#include <complex>
#include "otbSinclairToCovarianceMatrixFunctor.h"
namespace otb
......
......@@ -21,7 +21,7 @@
#ifndef otbSinclairToCoherencyMatrixFunctor_h
#define otbSinclairToCoherencyMatrixFunctor_h
#include "std::complex.h"
#include <complex>
namespace otb
{
......
......@@ -21,7 +21,7 @@
#ifndef otbSinclairToCovarianceMatrixFunctor_h
#define otbSinclairToCovarianceMatrixFunctor_h
#include "std::complex.h"
#include <complex>
namespace otb
{
......
......@@ -21,7 +21,7 @@
#ifndef otbSinclairToMuellerMatrixFunctor_h
#define otbSinclairToMuellerMatrixFunctor_h
#include "std::complex.h"
#include <complex>
namespace otb
{
......
......@@ -21,7 +21,7 @@
#ifndef otbSinclairToReciprocalCircularCovarianceMatrixFunctor_h
#define otbSinclairToReciprocalCircularCovarianceMatrixFunctor_h
#include "std::complex.h"
#include <complex>
#include "otbSinclairToReciprocalCovarianceMatrixFunctor.h"
namespace otb
......
......@@ -22,7 +22,7 @@
#define otbSinclairToReciprocalCoherencyMatrixFunctor_h
#include "itkMacro.h"
#include "std::complex.h"
#include <complex>
#include "otbMath.h"
#include "vnl/vnl_matrix.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbSinclairToReciprocalCovarianceMatrixFunctor_h
#define otbSinclairToReciprocalCovarianceMatrixFunctor_h
#include "std::complex.h"
#include <complex>
#include "otbMath.h"
#include "vnl/vnl_matrix.h"
......
......@@ -18,8 +18,8 @@
* limitations under the License.
*/
#include "std::complex.h"
#include "vcl_cmath.h"
#include <complex>
#include <cmath>
#include "otbPolarimetricSynthesisFunctor.h"
int otbPolarimetricSynthesisFunctor(int itkNotUsed(argc), char * itkNotUsed(argv)[])
......
......@@ -26,7 +26,7 @@
#include "itkImageToImageFilter.h"
#include "itkImageRegionConstIterator.h"
#include "itkImageRegionConstIteratorWithIndex.h"
#include <vcl_algorithm.h>
#include <algorithm>
namespace otb
......
......@@ -22,7 +22,7 @@
#define otbTimeSeries_h
#include "itkFixedArray.h"
#include <vcl_cmath.h>
#include <cmath>
namespace otb
{
......
......@@ -22,7 +22,7 @@
#include "otbWaveletGenerator.h"
#include <vcl_cmath.h>
#include <cmath>
#include "itkMacro.h"
#include "otbMath.h"
......
......@@ -24,7 +24,7 @@
#include "otbEigenvalueLikelihoodMaximisation.h"
#include <vcl_algorithm.h>
#include <algorithm>
namespace otb
{
......
......@@ -24,7 +24,7 @@
#include "otbVirtualDimensionality.h"
#include <vcl_algorithm.h>
#include <algorithm>
#include "otb_boost_math_normal_header.h"
namespace otb
......
......@@ -26,7 +26,7 @@
#include "itkConstNeighborhoodIterator.h"
#include "itkImageRegionConstIterator.h"
#include "itkImageLinearConstIteratorWithIndex.h"
#include <vcl_algorithm.h>
#include <algorithm>
namespace otb
{
......
......@@ -22,7 +22,7 @@
#define otb_GlImageActor_h
#include <vcl_algorithm.h>
#include <algorithm>
#include "itkCenteredRigid2DTransform.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment