Merge from V7_2_BR 09/08/2013

diff --git a/src/MEDLoader/Test/SauvLoaderTest.cxx b/src/MEDLoader/Test/SauvLoaderTest.cxx
index 62410d9b58d14503d0b7e4d570ffccf9246788d6..7d9dd430e3fe339f5f4a7c45912c664bb001ff06 100644 (file)
--- a/src/MEDLoader/Test/SauvLoaderTest.cxx
+++ b/src/MEDLoader/Test/SauvLoaderTest.cxx
@@ -113,10 +113,10 @@ void SauvLoaderTest::testMed2SauvOnAMeshWithVoidFamily()
   MEDCouplingAutoRefCountObjectPtr<SauvReader> sr=SauvReader::New(sauvFile);
   MEDCouplingAutoRefCountObjectPtr<MEDFileData> d2=sr->loadInMEDFileDS();
   MEDFileUMesh* m2 = static_cast<MEDFileUMesh*>( d2->getMeshes()->getMeshAtPos(0) );
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> grp1 = m2->getGroup(0, "Group1");
-  CPPUNIT_ASSERT_EQUAL(1,(int)grp1->getNumberOfCells());
-  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> grp2 = m2->getGroup(0, "Group2");
-  CPPUNIT_ASSERT_EQUAL(1,(int)grp2->getNumberOfCells());
+  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> group1 = m2->getGroup(0, "Group1");
+  CPPUNIT_ASSERT_EQUAL(1,(int)group1->getNumberOfCells());
+  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> group2 = m2->getGroup(0, "Group2");
+  CPPUNIT_ASSERT_EQUAL(1,(int)group2->getNumberOfCells());
   MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> 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 e4cbd0ef9ee7484cb7b48aecca20dbb30a2ad364..822593e4b81925a47c85089d13a98cb3bd7fa667 100644 (file)
--- 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 <set>
@@ -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 e64b82edbd3dc9798727708c6957fa6f9ce361fc..fa7b21ea3376eb1a20c85da229d71976c3aca358 100644 (file)
--- 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 <map>
 #include <vector>
 
@@ -36,7 +38,7 @@ namespace MEDPARTITIONER
   class MeshCollection;
   class MEDPARTITIONER_FaceModel;
     
-  class Topology
+  class MEDPARTITIONER_EXPORT Topology
   {
   public:
     Topology() { }