From d9b5f5c4264fc1a63b23d8c520f0d1b3d900881c Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 12 Aug 2013 10:29:30 +0000 Subject: [PATCH] Merge from V7_2_BR 09/08/2013 --- src/MEDLoader/Test/SauvLoaderTest.cxx | 8 ++++---- src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx | 4 +++- src/MEDPartitioner/MEDPARTITIONER_Topology.hxx | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/MEDLoader/Test/SauvLoaderTest.cxx b/src/MEDLoader/Test/SauvLoaderTest.cxx index 62410d9b5..7d9dd430e 100644 --- a/src/MEDLoader/Test/SauvLoaderTest.cxx +++ b/src/MEDLoader/Test/SauvLoaderTest.cxx @@ -113,10 +113,10 @@ void SauvLoaderTest::testMed2SauvOnAMeshWithVoidFamily() MEDCouplingAutoRefCountObjectPtr sr=SauvReader::New(sauvFile); MEDCouplingAutoRefCountObjectPtr d2=sr->loadInMEDFileDS(); MEDFileUMesh* m2 = static_cast( d2->getMeshes()->getMeshAtPos(0) ); - MEDCouplingAutoRefCountObjectPtr grp1 = m2->getGroup(0, "Group1"); - CPPUNIT_ASSERT_EQUAL(1,(int)grp1->getNumberOfCells()); - MEDCouplingAutoRefCountObjectPtr grp2 = m2->getGroup(0, "Group2"); - CPPUNIT_ASSERT_EQUAL(1,(int)grp2->getNumberOfCells()); + MEDCouplingAutoRefCountObjectPtr group1 = m2->getGroup(0, "Group1"); + CPPUNIT_ASSERT_EQUAL(1,(int)group1->getNumberOfCells()); + MEDCouplingAutoRefCountObjectPtr group2 = m2->getGroup(0, "Group2"); + CPPUNIT_ASSERT_EQUAL(1,(int)group2->getNumberOfCells()); MEDCouplingAutoRefCountObjectPtr grptot = m2->getGroup(0, "Grouptot"); CPPUNIT_ASSERT_EQUAL(2,(int)grptot->getNumberOfCells()); } diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx index e4cbd0ef9..822593e4b 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx @@ -20,9 +20,11 @@ #ifndef __MEDPARTITIONER_PARALLELTOPOLOGY_HXX__ #define __MEDPARTITIONER_PARALLELTOPOLOGY_HXX__ +#include "MEDPARTITIONER.hxx" #include "MEDPARTITIONER_Topology.hxx" #include "MEDPARTITIONER_ParaDomainSelector.hxx" + #include "InterpKernelHashMap.hxx" #include @@ -34,7 +36,7 @@ namespace MEDPARTITIONER class MeshCollection; class MEDPARTITIONER_FaceModel; - class ParallelTopology : public Topology + class MEDPARTITIONER_EXPORT ParallelTopology : public Topology { public: diff --git a/src/MEDPartitioner/MEDPARTITIONER_Topology.hxx b/src/MEDPartitioner/MEDPARTITIONER_Topology.hxx index e64b82edb..fa7b21ea3 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_Topology.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_Topology.hxx @@ -20,6 +20,8 @@ #ifndef __MEDPARTITIONER_TOPOLOGY_HXX__ #define __MEDPARTITIONER_TOPOLOGY_HXX__ +#include "MEDPARTITIONER.hxx" + #include #include @@ -36,7 +38,7 @@ namespace MEDPARTITIONER class MeshCollection; class MEDPARTITIONER_FaceModel; - class Topology + class MEDPARTITIONER_EXPORT Topology { public: Topology() { } -- 2.39.2