From 10d59bbf69f8d121fddc32c05791a8404b73e813 Mon Sep 17 00:00:00 2001
From: Claudine Bon <claudine.bon@samtech.com>
Date: Tue, 5 Aug 2008 14:31:15 +0000
Subject: [PATCH] ifdef MZone* with HAVE_CGNS for now
---
Geo/CustomContainer.h | 2 +-
Geo/GModelIO_CGNS.cpp | 9 +++++----
Geo/MZone.cpp | 4 ++++
Geo/MZoneBoundary.cpp | 4 ++++
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Geo/CustomContainer.h b/Geo/CustomContainer.h
index 5f6ac7d606..734e60853d 100644
--- a/Geo/CustomContainer.h
+++ b/Geo/CustomContainer.h
@@ -173,7 +173,7 @@ class Block
// Destructor
~Block()
{
- free(array);
+ std::free(array);
}
friend class Pool<T>;
diff --git a/Geo/GModelIO_CGNS.cpp b/Geo/GModelIO_CGNS.cpp
index 7e589938e6..9405c8153a 100644
--- a/Geo/GModelIO_CGNS.cpp
+++ b/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
diff --git a/Geo/MZone.cpp b/Geo/MZone.cpp
index 6391e70b76..635a8f96d8 100644
--- a/Geo/MZone.cpp
+++ b/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
diff --git a/Geo/MZoneBoundary.cpp b/Geo/MZoneBoundary.cpp
index 2b234892a6..35883fefcd 100644
--- a/Geo/MZoneBoundary.cpp
+++ b/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
--
GitLab