From 4bbbbf780aff789aa73ed042cde8647c44e4aac3 Mon Sep 17 00:00:00 2001 From: Robert Keser Date: Fri, 31 Mar 2017 12:36:01 +0200 Subject: [PATCH] Bugfix: Windows now compiles surfaceCoarsen Author: Vanja Skuric --- applications/utilities/surface/surfaceCoarsen/Make/files | 2 +- .../utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C | 2 +- .../surface/surfaceCoarsen/bunnylod/{list.h => listb.h} | 0 .../utilities/surface/surfaceCoarsen/bunnylod/progmesh.C | 4 ++-- .../utilities/surface/surfaceCoarsen/bunnylod/progmesh.h | 4 ++-- .../surface/surfaceCoarsen/bunnylod/{vector.C => vectorb.C} | 2 +- .../surface/surfaceCoarsen/bunnylod/{vector.h => vectorb.h} | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename applications/utilities/surface/surfaceCoarsen/bunnylod/{list.h => listb.h} (100%) rename applications/utilities/surface/surfaceCoarsen/bunnylod/{vector.C => vectorb.C} (99%) rename applications/utilities/surface/surfaceCoarsen/bunnylod/{vector.h => vectorb.h} (100%) diff --git a/applications/utilities/surface/surfaceCoarsen/Make/files b/applications/utilities/surface/surfaceCoarsen/Make/files index f2a1e0725..f9538c5dd 100644 --- a/applications/utilities/surface/surfaceCoarsen/Make/files +++ b/applications/utilities/surface/surfaceCoarsen/Make/files @@ -1,5 +1,5 @@ bunnylod/progmesh.C -bunnylod/vector.C +bunnylod/vectorb.C surfaceCoarsen.C EXE = $(FOAM_APPBIN)/surfaceCoarsen diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C b/applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C index 506eb938a..17e89ab4e 100644 --- a/applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C +++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C @@ -19,7 +19,7 @@ #include #pragma warning(disable : 4244) -#include "vector.h" +#include "vectorb.h" #include "font.h" #include "progmesh.h" #include "rabdata.h" diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/list.h b/applications/utilities/surface/surfaceCoarsen/bunnylod/listb.h similarity index 100% rename from applications/utilities/surface/surfaceCoarsen/bunnylod/list.h rename to applications/utilities/surface/surfaceCoarsen/bunnylod/listb.h diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C index 165abef9f..ec29fd02f 100644 --- a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C +++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C @@ -13,8 +13,8 @@ #include //#include -#include "vector.h" -#include "list.h" +#include "vectorb.h" +#include "listb.h" #include "progmesh.h" #define min(x,y) (((x) <= (y)) ? (x) : (y)) diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h index f87ce4cbe..c420d43fd 100644 --- a/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h +++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.h @@ -18,8 +18,8 @@ #ifndef PROGRESSIVE_MESH_H #define PROGRESSIVE_MESH_H -#include "vector.h" -#include "list.h" +#include "vectorb.h" +#include "listb.h" class tridata { public: diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/vector.C b/applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.C similarity index 99% rename from applications/utilities/surface/surfaceCoarsen/bunnylod/vector.C rename to applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.C index d3ead286f..360886830 100644 --- a/applications/utilities/surface/surfaceCoarsen/bunnylod/vector.C +++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.C @@ -3,7 +3,7 @@ #include #include -#include "vector.h" +#include "vectorb.h" float sqr(float a) {return a*a;} diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/vector.h b/applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.h similarity index 100% rename from applications/utilities/surface/surfaceCoarsen/bunnylod/vector.h rename to applications/utilities/surface/surfaceCoarsen/bunnylod/vectorb.h