From 30415e15ac5ae14c5e62468bed26f36cd64451b2 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 3 Dec 2014 14:04:51 +0300 Subject: [PATCH] Issue 0022816: duplicated files Don't install chrono.hxx file --- src/SMDS/CMakeLists.txt | 1 - src/SMDS/SMDS_UnstructuredGrid.cxx | 1 + src/SMDS/SMDS_UnstructuredGrid.hxx | 1 - src/SMESH/SMESH_Gen.cxx | 1 - src/SMESH/SMESH_Gen.hxx | 4 ---- src/SMESH/SMESH_MeshEditor.cxx | 1 + 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/SMDS/CMakeLists.txt b/src/SMDS/CMakeLists.txt index 2187eeea9..d770fe39d 100644 --- a/src/SMDS/CMakeLists.txt +++ b/src/SMDS/CMakeLists.txt @@ -41,7 +41,6 @@ SET(_link_LIBRARIES # header files / no moc processing SET(SMDS_HEADERS - chrono.hxx ObjectPool.hxx SMDS_TypeOfPosition.hxx SMDSAbs_ElementType.hxx diff --git a/src/SMDS/SMDS_UnstructuredGrid.cxx b/src/SMDS/SMDS_UnstructuredGrid.cxx index 6012a4f38..b1ff14967 100644 --- a/src/SMDS/SMDS_UnstructuredGrid.cxx +++ b/src/SMDS/SMDS_UnstructuredGrid.cxx @@ -24,6 +24,7 @@ #include "SMDS_MeshVolume.hxx" #include "utilities.h" +#include "chrono.hxx" #include #include diff --git a/src/SMDS/SMDS_UnstructuredGrid.hxx b/src/SMDS/SMDS_UnstructuredGrid.hxx index 5063adc21..67a8edc73 100644 --- a/src/SMDS/SMDS_UnstructuredGrid.hxx +++ b/src/SMDS/SMDS_UnstructuredGrid.hxx @@ -28,7 +28,6 @@ #include #include -#include "chrono.hxx" #include #include diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 864f50c21..d009d077a 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -70,7 +70,6 @@ SMESH_Gen::SMESH_Gen() _segmentation = _nbSegments = 10; SMDS_Mesh::_meshList.clear(); MESSAGE(SMDS_Mesh::_meshList.size()); - //_counters = new counters(100); _compute_canceled = false; _sm_current = NULL; //vtkDebugLeaks::SetExitError(0); diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx index 4dac76d43..064d76853 100644 --- a/src/SMESH/SMESH_Gen.hxx +++ b/src/SMESH/SMESH_Gen.hxx @@ -37,8 +37,6 @@ #include "SMESH_Algo.hxx" #include "SMESH_Mesh.hxx" -#include "chrono.hxx" - #include #include @@ -175,8 +173,6 @@ private: // default number of segments int _nbSegments; - counters *_counters; - volatile bool _compute_canceled; SMESH_subMesh* _sm_current; }; diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index 08cc1d9c2..a625ba50a 100644 --- a/src/SMESH/SMESH_MeshEditor.cxx +++ b/src/SMESH/SMESH_MeshEditor.cxx @@ -50,6 +50,7 @@ #include #include "utilities.h" +#include "chrono.hxx" #include #include -- 2.30.2