Merge topic 'move-vtkextenttranslator' into master

1f330db3 Update export header for vtkExtentTranslator after move
f4701fa0 Move vtkExtentTranslator to Common/DataModel

Common/DataModel/CMakeLists.txt

@@ -187,6 +187,7 @@ set(Module_SRCS
   vtkOverlappingAMR.cxx
   vtkUniformGridAMR.cxx
   vtkUniformGridAMRDataIterator.cxx
+  vtkExtentTranslator.cxx # needed by vtkDataSet
   )
 
 set(${vtk-module}_HDRS

Common/ExecutionModel/vtkExtentTranslator.cxx → Common/DataModel/vtkExtentTranslator.cxx

@@ -377,10 +377,3 @@ void vtkExtentTranslator::PrintSelf(ostream& os, vtkIndent indent)
     os << "Unknown\n";
     }
 }
-
-
-
-
-
-
-

Common/ExecutionModel/vtkExtentTranslator.h → Common/DataModel/vtkExtentTranslator.h

@@ -25,11 +25,11 @@
 #ifndef __vtkExtentTranslator_h
 #define __vtkExtentTranslator_h
 
-#include "vtkCommonExecutionModelModule.h" // For export macro
+#include "vtkCommonDataModelModule.h" // For export macro
 #include "vtkObject.h"
 
 
-class VTKCOMMONEXECUTIONMODEL_EXPORT vtkExtentTranslator : public vtkObject
+class VTKCOMMONDATAMODEL_EXPORT vtkExtentTranslator : public vtkObject
 {
 public:
   static vtkExtentTranslator *New();
@@ -129,4 +129,3 @@ private:
 };
 
 #endif
-

Common/ExecutionModel/CMakeLists.txt

@@ -17,7 +17,6 @@ SET(Module_SRCS
   vtkExecutiveCollection.cxx
   vtkExecutive.cxx
   vtkExtentSplitter.cxx
-  vtkExtentTranslator.cxx
   vtkFilteringInformationKeyManager.cxx
   vtkGraphAlgorithm.cxx
   vtkHierarchicalBoxDataSetAlgorithm.cxx