From 7d702bcc1f430db8b1b83a8086ce5767d1b38095 Mon Sep 17 00:00:00 2001 From: Joachim Pouderoux Date: Wed, 30 Oct 2013 00:12:17 +0100 Subject: [PATCH] Add algorithm header for std::max function. This generates an error with Visual C++ 2013. See http://blogs.msdn.com/b/vcblog/archive/2013/06/28/c-11-14-stl-features-fixes-and-breaking-changes-in-vs-2013.aspx This is a breaking change in VS2013 to be conform to C++11: "You must #include when calling std::min() or std::max()" Change-Id: Ib43dfe0b7bf249d23bd6539f0f3b0e38bc9af5b2 --- Charts/Core/vtkContextPolygon.cxx | 1 + Charts/Core/vtkPiecewisePointHandleItem.cxx | 2 ++ Common/Core/vtkUnicodeStringArray.cxx | 1 + Common/DataModel/vtkMappedUnstructuredGrid.txx | 1 + Filters/Core/vtkCutter.cxx | 1 + Filters/Core/vtkThreshold.cxx | 2 ++ Filters/General/vtkNormalizeMatrixVectors.cxx | 2 ++ Filters/Imaging/vtkPairwiseExtractHistogram2D.cxx | 1 + IO/Geometry/vtkMoleculeReaderBase.cxx | 1 + Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx | 1 + Infovis/Layout/vtkIncrementalForceLayout.cxx | 1 + Rendering/Context2D/vtkMarkerUtilities.cxx | 2 ++ Rendering/Core/vtkTextMapper.cxx | 2 ++ Rendering/FreeType/vtkMathTextUtilities.cxx | 2 ++ Rendering/FreeType/vtkTextActor.cxx | 2 ++ Views/Infovis/vtkParallelCoordinatesRepresentation.cxx | 1 + 16 files changed, 23 insertions(+) diff --git a/Charts/Core/vtkContextPolygon.cxx b/Charts/Core/vtkContextPolygon.cxx index 65c0a43ecc..e6150f55e1 100644 --- a/Charts/Core/vtkContextPolygon.cxx +++ b/Charts/Core/vtkContextPolygon.cxx @@ -15,6 +15,7 @@ #include "vtkContextPolygon.h" +#include #include #include "vtkTransform2D.h" diff --git a/Charts/Core/vtkPiecewisePointHandleItem.cxx b/Charts/Core/vtkPiecewisePointHandleItem.cxx index 4d71c3880c..cd99186fa8 100644 --- a/Charts/Core/vtkPiecewisePointHandleItem.cxx +++ b/Charts/Core/vtkPiecewisePointHandleItem.cxx @@ -29,6 +29,8 @@ #include "vtkTransform2D.h" #include "vtkNew.h" +#include + enum enumPointHandleType { enSharpNess=0, diff --git a/Common/Core/vtkUnicodeStringArray.cxx b/Common/Core/vtkUnicodeStringArray.cxx index bbc15d8a69..fa2c97ef02 100644 --- a/Common/Core/vtkUnicodeStringArray.cxx +++ b/Common/Core/vtkUnicodeStringArray.cxx @@ -20,6 +20,7 @@ #include "vtkUnicodeStringArray.h" #include +#include class vtkUnicodeStringArray::Implementation { diff --git a/Common/DataModel/vtkMappedUnstructuredGrid.txx b/Common/DataModel/vtkMappedUnstructuredGrid.txx index 007bf741d2..56cf104c9d 100644 --- a/Common/DataModel/vtkMappedUnstructuredGrid.txx +++ b/Common/DataModel/vtkMappedUnstructuredGrid.txx @@ -16,6 +16,7 @@ #include "vtkMappedUnstructuredGrid.h" #include "vtkGenericCell.h" +#include //------------------------------------------------------------------------------ template diff --git a/Filters/Core/vtkCutter.cxx b/Filters/Core/vtkCutter.cxx index a8ac417547..9dc08fe0a5 100644 --- a/Filters/Core/vtkCutter.cxx +++ b/Filters/Core/vtkCutter.cxx @@ -47,6 +47,7 @@ #include "vtkSmartPointer.h" #include "vtkContourHelper.h" +#include #include vtkStandardNewMacro(vtkCutter); diff --git a/Filters/Core/vtkThreshold.cxx b/Filters/Core/vtkThreshold.cxx index 17ac022843..9f59d737f0 100644 --- a/Filters/Core/vtkThreshold.cxx +++ b/Filters/Core/vtkThreshold.cxx @@ -25,6 +25,8 @@ #include "vtkStreamingDemandDrivenPipeline.h" #include "vtkMath.h" +#include + vtkStandardNewMacro(vtkThreshold); // Construct with lower threshold=0, upper threshold=1, and threshold diff --git a/Filters/General/vtkNormalizeMatrixVectors.cxx b/Filters/General/vtkNormalizeMatrixVectors.cxx index b888f67224..ec0f3105e3 100644 --- a/Filters/General/vtkNormalizeMatrixVectors.cxx +++ b/Filters/General/vtkNormalizeMatrixVectors.cxx @@ -28,6 +28,8 @@ #include "vtkSmartPointer.h" #include "vtkTypedArray.h" +#include + /////////////////////////////////////////////////////////////////////////////// // vtkNormalizeMatrixVectors diff --git a/Filters/Imaging/vtkPairwiseExtractHistogram2D.cxx b/Filters/Imaging/vtkPairwiseExtractHistogram2D.cxx index 5d7d9d7e0f..1ad75f6ece 100644 --- a/Filters/Imaging/vtkPairwiseExtractHistogram2D.cxx +++ b/Filters/Imaging/vtkPairwiseExtractHistogram2D.cxx @@ -40,6 +40,7 @@ PURPOSE. See the above copyright notice for more information. #define VTK_CREATE(type, name) \ vtkSmartPointer name = vtkSmartPointer::New() //------------------------------------------------------------------------------ +#include #include #include #include diff --git a/IO/Geometry/vtkMoleculeReaderBase.cxx b/IO/Geometry/vtkMoleculeReaderBase.cxx index 97965003e1..b980d059ba 100644 --- a/IO/Geometry/vtkMoleculeReaderBase.cxx +++ b/IO/Geometry/vtkMoleculeReaderBase.cxx @@ -29,6 +29,7 @@ #include "vtkPointLocator.h" #include "vtkNew.h" +#include #include diff --git a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx index f08d41b147..ef410644f1 100644 --- a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx +++ b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx @@ -31,6 +31,7 @@ #include "vtkSmartPointer.h" #include "vtkTable.h" +#include #include #include diff --git a/Infovis/Layout/vtkIncrementalForceLayout.cxx b/Infovis/Layout/vtkIncrementalForceLayout.cxx index d8c5ed1140..dfa449f633 100644 --- a/Infovis/Layout/vtkIncrementalForceLayout.cxx +++ b/Infovis/Layout/vtkIncrementalForceLayout.cxx @@ -11,6 +11,7 @@ #include "vtkVariant.h" #include "vtkVector.h" +#include #include #include diff --git a/Rendering/Context2D/vtkMarkerUtilities.cxx b/Rendering/Context2D/vtkMarkerUtilities.cxx index 9d587b4ecd..47a2f723a9 100644 --- a/Rendering/Context2D/vtkMarkerUtilities.cxx +++ b/Rendering/Context2D/vtkMarkerUtilities.cxx @@ -17,6 +17,8 @@ #include "vtkImageData.h" +#include + //----------------------------------------------------------------------------- vtkMarkerUtilities::vtkMarkerUtilities() { diff --git a/Rendering/Core/vtkTextMapper.cxx b/Rendering/Core/vtkTextMapper.cxx index 1b33531dfb..ca9d35c19f 100644 --- a/Rendering/Core/vtkTextMapper.cxx +++ b/Rendering/Core/vtkTextMapper.cxx @@ -29,6 +29,8 @@ #include "vtkTextRenderer.h" #include "vtkTexture.h" +#include + //---------------------------------------------------------------------------- vtkObjectFactoryNewMacro(vtkTextMapper) //---------------------------------------------------------------------------- diff --git a/Rendering/FreeType/vtkMathTextUtilities.cxx b/Rendering/FreeType/vtkMathTextUtilities.cxx index 7f7f27ed2e..4667f59e87 100644 --- a/Rendering/FreeType/vtkMathTextUtilities.cxx +++ b/Rendering/FreeType/vtkMathTextUtilities.cxx @@ -27,6 +27,8 @@ #include "vtkDebugLeaks.h" #endif +#include + //---------------------------------------------------------------------------- vtkInstantiatorNewMacro(vtkMathTextUtilities) diff --git a/Rendering/FreeType/vtkTextActor.cxx b/Rendering/FreeType/vtkTextActor.cxx index 0670666ebc..a3243d3e74 100644 --- a/Rendering/FreeType/vtkTextActor.cxx +++ b/Rendering/FreeType/vtkTextActor.cxx @@ -30,6 +30,8 @@ #include "vtkTextRenderer.h" #include "vtkRenderer.h" +#include + vtkStandardNewMacro(vtkTextActor); vtkCxxSetObjectMacro(vtkTextActor,Texture,vtkTexture); diff --git a/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx b/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx index fb14015dec..2c3ade7d3e 100644 --- a/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx +++ b/Views/Infovis/vtkParallelCoordinatesRepresentation.cxx @@ -78,6 +78,7 @@ PURPOSE. See the above copyright notice for more information. #include "vtkUnsignedIntArray.h" #include "vtkViewTheme.h" +#include #include #include -- 2.24.1