Last cleanup

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx
index 03ae45f561930e04335dffc56431ebf2293234ba..db8f43d67999693ce6872b47d549153b48131e40 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx
@@ -28,9 +28,7 @@
 
 #include <algorithm>
 
-#ifdef WIN32
 #include <functional>
-#endif 
 
 
 using namespace INTERP_KERNEL;

diff --git a/src/INTERP_KERNEL/InterpKernelCellSimplify.cxx b/src/INTERP_KERNEL/InterpKernelCellSimplify.cxx
index 761c1595cd49ec49e2acb2082d86db1b955287ad..ebc88f280bc53740c565c4392b0162bdbb6ae6c1 100644 (file)
--- a/src/INTERP_KERNEL/InterpKernelCellSimplify.cxx
+++ b/src/INTERP_KERNEL/InterpKernelCellSimplify.cxx
@@ -21,6 +21,7 @@
 #include "InterpKernelCellSimplify.hxx"
 #include "CellModel.hxx"
 
+#include <functional>
 #include <algorithm>
 #include <iterator>
 #include <sstream>
@@ -31,10 +32,6 @@
 #include <list>
 #include <set>
 
-#ifdef WIN32
-#include <functional>
-#endif 
-
 using namespace INTERP_KERNEL;
 
 /*!

diff --git a/src/MEDCoupling/MEDCouplingMemArray.hxx b/src/MEDCoupling/MEDCouplingMemArray.hxx
index 4ee8a3d7ee016bd34cce19f4b9518fb25630f5a9..8d877f7dc554b8f2c4f542841037c977fe4edabb 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMemArray.hxx
+++ b/src/MEDCoupling/MEDCouplingMemArray.hxx
@@ -51,14 +51,14 @@ namespace MEDCoupling
   class MEDCouplingPointer
   {
   public:
-       MEDCOUPLING_EXPORT MEDCouplingPointer():_internal(0),_external(0) { }
-       MEDCOUPLING_EXPORT void null() { _internal=0; _external=0; }
-       MEDCOUPLING_EXPORT bool isNull() const { return _internal==0 && _external==0; }
-       MEDCOUPLING_EXPORT void setInternal(T *pointer);
-       MEDCOUPLING_EXPORT void setExternal(const T *pointer);
-       MEDCOUPLING_EXPORT const T *getConstPointer() const { if(_internal) return _internal; else return _external; }
-       MEDCOUPLING_EXPORT const T *getConstPointerLoc(std::size_t offset) const { if(_internal) return _internal+offset; else return _external+offset; }
-       MEDCOUPLING_EXPORT T *getPointer() { if(_internal) return _internal; if(_external) throw INTERP_KERNEL::Exception("Trying to write on an external pointer."); else return 0; }
+    MEDCOUPLING_EXPORT MEDCouplingPointer():_internal(0),_external(0) { }
+    MEDCOUPLING_EXPORT void null() { _internal=0; _external=0; }
+    MEDCOUPLING_EXPORT bool isNull() const { return _internal==0 && _external==0; }
+    MEDCOUPLING_EXPORT void setInternal(T *pointer);
+    MEDCOUPLING_EXPORT void setExternal(const T *pointer);
+    MEDCOUPLING_EXPORT const T *getConstPointer() const { if(_internal) return _internal; else return _external; }
+    MEDCOUPLING_EXPORT const T *getConstPointerLoc(std::size_t offset) const { if(_internal) return _internal+offset; else return _external+offset; }
+    MEDCOUPLING_EXPORT T *getPointer() { if(_internal) return _internal; if(_external) throw INTERP_KERNEL::Exception("Trying to write on an external pointer."); else return 0; }
   private:
     T *_internal;
     const T *_external;
@@ -71,44 +71,44 @@ namespace MEDCoupling
     typedef void (*Deallocator)(void *,void *);
   public:
     MEDCOUPLING_EXPORT MemArray():_nb_of_elem(0),_nb_of_elem_alloc(0),_ownership(false),_dealloc(0),_param_for_deallocator(0) { }
-       MEDCOUPLING_EXPORT MemArray(const MemArray<T>& other);
-       MEDCOUPLING_EXPORT bool isNull() const { return _pointer.isNull(); }
-       MEDCOUPLING_EXPORT const T *getConstPointerLoc(std::size_t offset) const { return _pointer.getConstPointerLoc(offset); }
-       MEDCOUPLING_EXPORT const T *getConstPointer() const { return _pointer.getConstPointer(); }
-       MEDCOUPLING_EXPORT std::size_t getNbOfElem() const { return _nb_of_elem; }
-       MEDCOUPLING_EXPORT std::size_t getNbOfElemAllocated() const { return _nb_of_elem_alloc; }
-       MEDCOUPLING_EXPORT T *getPointer() { return _pointer.getPointer(); }
-       MEDCOUPLING_EXPORT MemArray<T> &operator=(const MemArray<T>& other);
-       MEDCOUPLING_EXPORT T operator[](std::size_t id) const { return _pointer.getConstPointer()[id]; }
-       MEDCOUPLING_EXPORT T& operator[](std::size_t id) { return _pointer.getPointer()[id]; }
-       MEDCOUPLING_EXPORT bool isEqual(const MemArray<T>& other, T prec, std::string& reason) const;
-       MEDCOUPLING_EXPORT void repr(int sl, std::ostream& stream) const;
-       MEDCOUPLING_EXPORT bool reprHeader(int sl, std::ostream& stream) const;
-       MEDCOUPLING_EXPORT void reprZip(int sl, std::ostream& stream) const;
-       MEDCOUPLING_EXPORT void reprNotTooLong(int sl, std::ostream& stream) const;
-       MEDCOUPLING_EXPORT void fillWithValue(const T& val);
-       MEDCOUPLING_EXPORT T *fromNoInterlace(int nbOfComp) const;
-       MEDCOUPLING_EXPORT T *toNoInterlace(int nbOfComp) const;
-       MEDCOUPLING_EXPORT void sort(bool asc);
-       MEDCOUPLING_EXPORT void reverse(int nbOfComp);
-       MEDCOUPLING_EXPORT void alloc(std::size_t nbOfElements);
-       MEDCOUPLING_EXPORT void reserve(std::size_t newNbOfElements);
-       MEDCOUPLING_EXPORT void reAlloc(std::size_t newNbOfElements);
-       MEDCOUPLING_EXPORT void useArray(const T *array, bool ownership, DeallocType type, std::size_t nbOfElem);
-       MEDCOUPLING_EXPORT void useExternalArrayWithRWAccess(const T *array, std::size_t nbOfElem);
-       MEDCOUPLING_EXPORT void writeOnPlace(std::size_t id, T element0, const T *others, std::size_t sizeOfOthers);
+    MEDCOUPLING_EXPORT MemArray(const MemArray<T>& other);
+    MEDCOUPLING_EXPORT bool isNull() const { return _pointer.isNull(); }
+    MEDCOUPLING_EXPORT const T *getConstPointerLoc(std::size_t offset) const { return _pointer.getConstPointerLoc(offset); }
+    MEDCOUPLING_EXPORT const T *getConstPointer() const { return _pointer.getConstPointer(); }
+    MEDCOUPLING_EXPORT std::size_t getNbOfElem() const { return _nb_of_elem; }
+    MEDCOUPLING_EXPORT std::size_t getNbOfElemAllocated() const { return _nb_of_elem_alloc; }
+    MEDCOUPLING_EXPORT T *getPointer() { return _pointer.getPointer(); }
+    MEDCOUPLING_EXPORT MemArray<T> &operator=(const MemArray<T>& other);
+    MEDCOUPLING_EXPORT T operator[](std::size_t id) const { return _pointer.getConstPointer()[id]; }
+    MEDCOUPLING_EXPORT T& operator[](std::size_t id) { return _pointer.getPointer()[id]; }
+    MEDCOUPLING_EXPORT bool isEqual(const MemArray<T>& other, T prec, std::string& reason) const;
+    MEDCOUPLING_EXPORT void repr(int sl, std::ostream& stream) const;
+    MEDCOUPLING_EXPORT bool reprHeader(int sl, std::ostream& stream) const;
+    MEDCOUPLING_EXPORT void reprZip(int sl, std::ostream& stream) const;
+    MEDCOUPLING_EXPORT void reprNotTooLong(int sl, std::ostream& stream) const;
+    MEDCOUPLING_EXPORT void fillWithValue(const T& val);
+    MEDCOUPLING_EXPORT T *fromNoInterlace(int nbOfComp) const;
+    MEDCOUPLING_EXPORT T *toNoInterlace(int nbOfComp) const;
+    MEDCOUPLING_EXPORT void sort(bool asc);
+    MEDCOUPLING_EXPORT void reverse(int nbOfComp);
+    MEDCOUPLING_EXPORT void alloc(std::size_t nbOfElements);
+    MEDCOUPLING_EXPORT void reserve(std::size_t newNbOfElements);
+    MEDCOUPLING_EXPORT void reAlloc(std::size_t newNbOfElements);
+    MEDCOUPLING_EXPORT void useArray(const T *array, bool ownership, DeallocType type, std::size_t nbOfElem);
+    MEDCOUPLING_EXPORT void useExternalArrayWithRWAccess(const T *array, std::size_t nbOfElem);
+    MEDCOUPLING_EXPORT void writeOnPlace(std::size_t id, T element0, const T *others, std::size_t sizeOfOthers);
     template<class InputIterator>
     void insertAtTheEnd(InputIterator first, InputIterator last);
-       MEDCOUPLING_EXPORT void pushBack(T elem);
-       MEDCOUPLING_EXPORT T popBack();
-       MEDCOUPLING_EXPORT void pack() const;
-       MEDCOUPLING_EXPORT bool isDeallocatorCalled() const { return _ownership; }
-       MEDCOUPLING_EXPORT Deallocator getDeallocator() const { return _dealloc; }
-       MEDCOUPLING_EXPORT void setSpecificDeallocator(Deallocator dealloc) { _dealloc=dealloc; }
-       MEDCOUPLING_EXPORT void setParameterForDeallocator(void *param) { _param_for_deallocator=param; }
-       MEDCOUPLING_EXPORT void *getParameterForDeallocator() const { return _param_for_deallocator; }
-       MEDCOUPLING_EXPORT void destroy();
-       MEDCOUPLING_EXPORT ~MemArray() { destroy(); }
+    MEDCOUPLING_EXPORT void pushBack(T elem);
+    MEDCOUPLING_EXPORT T popBack();
+    MEDCOUPLING_EXPORT void pack() const;
+    MEDCOUPLING_EXPORT bool isDeallocatorCalled() const { return _ownership; }
+    MEDCOUPLING_EXPORT Deallocator getDeallocator() const { return _dealloc; }
+    MEDCOUPLING_EXPORT void setSpecificDeallocator(Deallocator dealloc) { _dealloc=dealloc; }
+    MEDCOUPLING_EXPORT void setParameterForDeallocator(void *param) { _param_for_deallocator=param; }
+    MEDCOUPLING_EXPORT void *getParameterForDeallocator() const { return _param_for_deallocator; }
+    MEDCOUPLING_EXPORT void destroy();
+    MEDCOUPLING_EXPORT ~MemArray() { destroy(); }
   public:
     static void CPPDeallocator(void *pt, void *param);
     static void CDeallocator(void *pt, void *param);

diff --git a/src/MEDCoupling/MEDCouplingPartDefinition.cxx b/src/MEDCoupling/MEDCouplingPartDefinition.cxx
index 6d5c92ad076235f3db45148e729cb287a4c7b2b5..3f1ba3f42c00011a88e8689e997f4156eaa7a087 100644 (file)
--- a/src/MEDCoupling/MEDCouplingPartDefinition.cxx
+++ b/src/MEDCoupling/MEDCouplingPartDefinition.cxx
@@ -20,11 +20,8 @@
 
 #include "MEDCouplingPartDefinition.hxx"
 
-#include <sstream>
-
-#ifdef WIN32
 #include <functional>
-#endif
+#include <sstream>
 
 using namespace MEDCoupling;
 

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
index 94d59eceae309e50156792148a3bdc0f093ed07c..7b572ab07982b88407d6541aa49f975917a039ea 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
@@ -23,7 +23,7 @@
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.hxx"
+#include "MEDCouplingMemArray.txx"
 
 #include <sstream>
 #include <cmath>

diff --git a/src/MEDCoupling_Swig/MEDCouplingCommon.i b/src/MEDCoupling_Swig/MEDCouplingCommon.i
index 9a94201a16363197bf5398a01abf72c080b49965..3335069fa788976b876a7ffd41ba6c25657c14aa 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingCommon.i
+++ b/src/MEDCoupling_Swig/MEDCouplingCommon.i
@@ -31,9 +31,7 @@
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingIMesh.hxx"
-#ifdef WIN32
 #include "MEDCouplingMap.txx"
-#endif
 #include "MEDCouplingCurveLinearMesh.hxx"
 #include "MEDCoupling1GTUMesh.hxx"
 #include "MEDCouplingField.hxx"

diff --git a/src/PyWrapping/medcoupling.i b/src/PyWrapping/medcoupling.i
index 3e3abc7cc45bd80ed921979fc2f31340e1f7f730..c97318d5b366b7baf6bdee822caa4aa6a5130304 100644 (file)
--- a/src/PyWrapping/medcoupling.i
+++ b/src/PyWrapping/medcoupling.i
@@ -21,12 +21,6 @@
 
 %module medcoupling
 
-%{
-#ifdef WIN32
-#include "MEDCouplingMap.txx"
-#endif
-%}
-
 #define MEDCOUPLINGREMAPPER_EXPORT
 #define INTERPKERNEL_EXPORT
 #define MEDCOUPLING_EXPORT

diff --git a/src/RENUMBER_Swig/MEDRenumber.i b/src/RENUMBER_Swig/MEDRenumber.i
index e2c08fbff0e627f55e359b33c4487a2538ab29bf..5c6a3646f3fa41c7a09b342325a84cbc6c5ca887 100644 (file)
--- a/src/RENUMBER_Swig/MEDRenumber.i
+++ b/src/RENUMBER_Swig/MEDRenumber.i
@@ -19,7 +19,6 @@
 
 %module MEDRenumber
 
-%include "MEDCouplingCommon.i"
 %include "MEDRenumberCommon.i"
 
 %pythoncode %{