From 3558e925f04eb92f1e0017e7fb49d6173c1fc9b6 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 30 Apr 2008 05:50:21 +0000
Subject: [PATCH] rename BoundaryLayer.* into BoundaryLayers.* to avoid naming
conflict when creating single lib (boundarylayer.cc exists in netgen)
---
.../{BoundaryLayer.cpp => BoundaryLayers.cpp} | 4 +--
Mesh/{BoundaryLayer.h => BoundaryLayers.h} | 4 +--
Mesh/Generator.cpp | 4 +--
Mesh/Makefile | 10 +++----
Post/Makefile | 30 +++++++++----------
5 files changed, 26 insertions(+), 26 deletions(-)
rename Mesh/{BoundaryLayer.cpp => BoundaryLayers.cpp} (98%)
rename Mesh/{BoundaryLayer.h => BoundaryLayers.h} (94%)
diff --git a/Mesh/BoundaryLayer.cpp b/Mesh/BoundaryLayers.cpp
similarity index 98%
rename from Mesh/BoundaryLayer.cpp
rename to Mesh/BoundaryLayers.cpp
index 9b5883415d..049f2354dd 100644
--- a/Mesh/BoundaryLayer.cpp
+++ b/Mesh/BoundaryLayers.cpp
@@ -1,4 +1,4 @@
-// $Id: BoundaryLayer.cpp,v 1.11 2008-03-20 11:44:08 geuzaine Exp $
+// $Id: BoundaryLayers.cpp,v 1.1 2008-04-30 05:50:21 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -21,7 +21,7 @@
#include "GModel.h"
#include "MElement.h"
-#include "BoundaryLayer.h"
+#include "BoundaryLayers.h"
#include "ExtrudeParams.h"
#include "meshGEdge.h"
#include "meshGFace.h"
diff --git a/Mesh/BoundaryLayer.h b/Mesh/BoundaryLayers.h
similarity index 94%
rename from Mesh/BoundaryLayer.h
rename to Mesh/BoundaryLayers.h
index e03441aed0..22ad91e350 100644
--- a/Mesh/BoundaryLayer.h
+++ b/Mesh/BoundaryLayers.h
@@ -1,5 +1,5 @@
-#ifndef _BOUNDARY_LAYER_H_
-#define _BOUNDARY_LAYER_H_
+#ifndef _BOUNDARY_LAYERS_H_
+#define _BOUNDARY_LAYERS_H_
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 043dacc5f6..4429e55f55 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,4 +1,4 @@
-// $Id: Generator.cpp,v 1.141 2008-04-28 10:10:52 geuzaine Exp $
+// $Id: Generator.cpp,v 1.142 2008-04-30 05:50:21 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -30,7 +30,7 @@
#include "meshGFaceBDS.h"
#include "meshGRegion.h"
#include "BackgroundMesh.h"
-#include "BoundaryLayer.h"
+#include "BoundaryLayers.h"
#include "HighOrder.h"
#if !defined(HAVE_NO_POST)
diff --git a/Mesh/Makefile b/Mesh/Makefile
index e74ad5d1ee..57904758e2 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.217 2008-04-28 10:10:52 geuzaine Exp $
+# $Id: Makefile,v 1.218 2008-04-30 05:50:21 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -53,7 +53,7 @@ SRC = Generator.cpp \
DivideAndConquer.cpp \
BackgroundMesh.cpp \
qualityMeasures.cpp \
- BoundaryLayer.cpp \
+ BoundaryLayers.cpp \
BDS.cpp \
HighOrder.cpp
@@ -100,7 +100,7 @@ Generator.o: Generator.cpp ../Common/Message.h ../Numeric/Numeric.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h meshGEdge.h \
meshGFace.h meshGFaceBDS.h meshGRegion.h BackgroundMesh.h \
- BoundaryLayer.h HighOrder.h ../Post/PView.h ../Post/PViewData.h \
+ BoundaryLayers.h HighOrder.h ../Post/PView.h ../Post/PViewData.h \
../DataStr/List.h ../Post/PViewOptions.h ../Post/ColorTable.h
Field.o: Field.cpp ../Common/Context.h Field.h ../Geo/Geo.h \
../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
@@ -345,7 +345,7 @@ qualityMeasures.o: qualityMeasures.cpp qualityMeasures.h BDS.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
-BoundaryLayer.o: BoundaryLayer.cpp ../Geo/GModel.h ../Geo/GVertex.h \
+BoundaryLayers.o: BoundaryLayers.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
@@ -355,7 +355,7 @@ BoundaryLayer.o: BoundaryLayer.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h BoundaryLayer.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h BoundaryLayers.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGEdge.h meshGFace.h \
../Common/Message.h
BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \
diff --git a/Post/Makefile b/Post/Makefile
index 4eb8779294..97002961aa 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.43 2008-04-23 23:00:40 geuzaine Exp $
+# $Id: Makefile,v 1.44 2008-04-30 05:50:21 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -97,8 +97,8 @@ PViewDataListIO.o: PViewDataListIO.cpp PViewDataList.h PViewData.h \
../Common/Context.h
PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../DataStr/List.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- PViewDataList.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
+ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
@@ -110,18 +110,18 @@ PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../Numeric/NumericEmbedded.h ../Common/Message.h
PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/Message.h \
PViewDataGModel.h PViewData.h ../DataStr/List.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h PViewDataList.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
- ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/StringUtils.h
+ ../Geo/SPoint3.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
+ ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \
+ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ ../Common/StringUtils.h
PViewOptions.o: PViewOptions.cpp PViewOptions.h ColorTable.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Message.h
adaptiveData.o: adaptiveData.cpp ../Plugin/Plugin.h ../Common/Options.h \
--
GitLab