ifdef MZone* with HAVE_CGNS for now

Geo/CustomContainer.h

@@ -173,7 +173,7 @@ class Block
   // Destructor
   ~Block()
   {
-    free(array);
+    std::free(array);
   }
 
   friend class Pool<T>;

Geo/GModelIO_CGNS.cpp

@@ -5,6 +5,11 @@
 //
 // GModelIO_CGNS.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
+#include "GModel.h"
+#include "Message.h"
+
+#if defined(HAVE_LIBCGNS)
+
 #ifdef _OPENMP
 #include <omp.h>
 #else
@@ -24,14 +29,10 @@
 #include <vector>
 #include <queue>
 
-#include "GModel.h"
-#include "Message.h"
 #include "MZone.h"
 #include "MZoneBoundary.h"
 #include "CGNSOptions.h"
 
-#if defined(HAVE_LIBCGNS)
-
 #include <cgnslib.h>
 
 //--Error function for the CGNS library

Geo/MZone.cpp

@@ -5,6 +5,8 @@
 //
 // MZone.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
+#if defined(HAVE_LIBCGNS)
+
 #include <iostream> // DBG
 #include "MZone.h"
 
@@ -341,3 +343,5 @@ template void MZone<2>::add_elements_in_entity
 template void MZone<3>::add_elements_in_entity
 <GRegion*>
 (GRegion* entity, const int partition);
+
+#endif

Geo/MZoneBoundary.cpp

@@ -5,6 +5,8 @@
 //
 // MZoneBoundary.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
 
+#if defined(HAVE_LIBCGNS)
+
 #include <iostream> // DBG
 #include <limits> // ?
 
@@ -921,3 +923,5 @@ MZoneBoundary<3>::GlobalVertexData<MFace>::FaceDataB::FaceDataB()
 
 template class MZoneBoundary<2>;
 template class MZoneBoundary<3>;
+
+#endif