From 7338fe7bb743a98b44d9a71138710f0504eb138c Mon Sep 17 00:00:00 2001
From: Amaury Johnen <amaury.johnen@uclouvain.be>
Date: Thu, 31 Aug 2017 18:16:21 +0200
Subject: [PATCH] fix compile
---
Geo/MHexahedron.cpp | 14 +++++++-------
Geo/MHexahedron.h | 2 +-
Geo/MPrism.cpp | 14 +++++++-------
Geo/MPrism.h | 2 +-
Geo/MPyramid.cpp | 14 +++++++-------
Geo/MPyramid.h | 2 +-
Geo/MTetrahedron.cpp | 14 +++++++-------
Geo/MTetrahedron.h | 2 +-
8 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Geo/MHexahedron.cpp b/Geo/MHexahedron.cpp
index f8da47a28c..30492e70a5 100644
--- a/Geo/MHexahedron.cpp
+++ b/Geo/MHexahedron.cpp
@@ -16,7 +16,7 @@
#include "qualityMeasures.h"
#endif
-std::map<int, indicesReversed> MHexahedronN::_order2indicesReversed;
+std::map<int, indicesReversed> MHexahedronN::_order2indicesReversedHex;
void MHexahedron::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
SVector3 *n)
@@ -411,7 +411,7 @@ int MHexahedronN::getNumFacesRep(bool curved)
CTX::instance()->mesh.numSubEdges * 2) : 12;
}
-void _getIndicesReversed(int order, indicesReversed &indices)
+void _getIndicesReversedHex(int order, indicesReversed &indices)
{
fullMatrix<double> ref = gmshGenerateMonomialsHexahedron(order);
@@ -432,12 +432,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
void MHexahedronN::reverse()
{
std::map<int, indicesReversed>::iterator it;
- it = _order2indicesReversed.find(_order);
- if (it == _order2indicesReversed.end()) {
+ it = _order2indicesReversedHex.find(_order);
+ if (it == _order2indicesReversedHex.end()) {
indicesReversed indices;
- _getIndicesReversed(_order, indices);
- _order2indicesReversed[_order] = indices;
- it = _order2indicesReversed.find(_order);
+ _getIndicesReversedHex(_order, indices);
+ _order2indicesReversedHex[_order] = indices;
+ it = _order2indicesReversedHex.find(_order);
}
indicesReversed &indices = it->second;
diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h
index d392fe8bd4..ba87474344 100644
--- a/Geo/MHexahedron.h
+++ b/Geo/MHexahedron.h
@@ -476,7 +476,7 @@ class MHexahedron27 : public MHexahedron {
typedef std::vector<int> indicesReversed;
class MHexahedronN : public MHexahedron {
- static std::map<int, indicesReversed> _order2indicesReversed;
+ static std::map<int, indicesReversed> _order2indicesReversedHex;
protected:
const char _order;
diff --git a/Geo/MPrism.cpp b/Geo/MPrism.cpp
index dc26b031d0..c833c6079a 100644
--- a/Geo/MPrism.cpp
+++ b/Geo/MPrism.cpp
@@ -13,7 +13,7 @@
#include "qualityMeasures.h"
#endif
-std::map<int, indicesReversed> MPrismN::_order2indicesReversed;
+std::map<int, indicesReversed> MPrismN::_order2indicesReversedPri;
void MPrism::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
SVector3 *n)
@@ -550,7 +550,7 @@ double MPrism::gammaShapeMeasure()
#endif
}
-void _getIndicesReversed(int order, indicesReversed &indices)
+void _getIndicesReversedPri(int order, indicesReversed &indices)
{
fullMatrix<double> ref = gmshGenerateMonomialsPrism(order);
@@ -571,12 +571,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
void MPrismN::reverse()
{
std::map<int, indicesReversed>::iterator it;
- it = _order2indicesReversed.find(_order);
- if (it == _order2indicesReversed.end()) {
+ it = _order2indicesReversedPri.find(_order);
+ if (it == _order2indicesReversedPri.end()) {
indicesReversed indices;
- _getIndicesReversed(_order, indices);
- _order2indicesReversed[_order] = indices;
- it = _order2indicesReversed.find(_order);
+ _getIndicesReversedPri(_order, indices);
+ _order2indicesReversedPri[_order] = indices;
+ it = _order2indicesReversedPri.find(_order);
}
indicesReversed &indices = it->second;
diff --git a/Geo/MPrism.h b/Geo/MPrism.h
index b763e8034c..bfbde23d5f 100644
--- a/Geo/MPrism.h
+++ b/Geo/MPrism.h
@@ -401,7 +401,7 @@ class MPrism18 : public MPrism {
typedef std::vector<int> indicesReversed;
class MPrismN : public MPrism {
- static std::map<int, indicesReversed> _order2indicesReversed;
+ static std::map<int, indicesReversed> _order2indicesReversedPri;
protected:
std::vector<MVertex *> _vs;
diff --git a/Geo/MPyramid.cpp b/Geo/MPyramid.cpp
index 0f9ae92613..1ce974cc93 100644
--- a/Geo/MPyramid.cpp
+++ b/Geo/MPyramid.cpp
@@ -10,7 +10,7 @@
#include "BasisFactory.h"
#include "pointsGenerators.h"
-std::map<int, indicesReversed> MPyramidN::_order2indicesReversed;
+std::map<int, indicesReversed> MPyramidN::_order2indicesReversedPyr;
int MPyramid::getVolumeSign()
{
@@ -335,7 +335,7 @@ void MPyramidN::getFaceRep(bool curved, int num,
else MPyramid::getFaceRep(false, num, x, y, z, n);
}
-void _getIndicesReversed(int order, indicesReversed &indices)
+void _getIndicesReversedPyr(int order, indicesReversed &indices)
{
fullMatrix<double> ref = gmshGenerateMonomialsPyramid(order);
@@ -356,12 +356,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
void MPyramidN::reverse()
{
std::map<int, indicesReversed>::iterator it;
- it = _order2indicesReversed.find(_order);
- if (it == _order2indicesReversed.end()) {
+ it = _order2indicesReversedPyr.find(_order);
+ if (it == _order2indicesReversedPyr.end()) {
indicesReversed indices;
- _getIndicesReversed(_order, indices);
- _order2indicesReversed[_order] = indices;
- it = _order2indicesReversed.find(_order);
+ _getIndicesReversedPyr(_order, indices);
+ _order2indicesReversedPyr[_order] = indices;
+ it = _order2indicesReversedPyr.find(_order);
}
indicesReversed &indices = it->second;
diff --git a/Geo/MPyramid.h b/Geo/MPyramid.h
index 128207abef..3bfe80a329 100644
--- a/Geo/MPyramid.h
+++ b/Geo/MPyramid.h
@@ -222,7 +222,7 @@ class MPyramid : public MElement {
typedef std::vector<int> indicesReversed;
class MPyramidN : public MPyramid {
- static std::map<int, indicesReversed> _order2indicesReversed;
+ static std::map<int, indicesReversed> _order2indicesReversedPyr;
protected:
std::vector<MVertex*> _vs;
diff --git a/Geo/MTetrahedron.cpp b/Geo/MTetrahedron.cpp
index 2a04407e5a..e8baab9e22 100644
--- a/Geo/MTetrahedron.cpp
+++ b/Geo/MTetrahedron.cpp
@@ -18,7 +18,7 @@
#define SQU(a) ((a)*(a))
-std::map<int, indicesReversed> MTetrahedronN::_order2indicesReversed;
+std::map<int, indicesReversed> MTetrahedronN::_order2indicesReversedTet;
void MTetrahedron::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
SVector3 *n)
@@ -318,7 +318,7 @@ void MTetrahedron::getFaceInfo(const MFace &face, int &ithFace, int &sign, int &
Msg::Error("Could not get face information for tetrahedron %d", getNum());
}
-void _getIndicesReversed(int order, indicesReversed &indices)
+void _getIndicesReversedTet(int order, indicesReversed &indices)
{
fullMatrix<double> ref = gmshGenerateMonomialsTetrahedron(order);
@@ -339,12 +339,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
void MTetrahedronN::reverse()
{
std::map<int, indicesReversed>::iterator it;
- it = _order2indicesReversed.find(_order);
- if (it == _order2indicesReversed.end()) {
+ it = _order2indicesReversedTet.find(_order);
+ if (it == _order2indicesReversedTet.end()) {
indicesReversed indices;
- _getIndicesReversed(_order, indices);
- _order2indicesReversed[_order] = indices;
- it = _order2indicesReversed.find(_order);
+ _getIndicesReversedTet(_order, indices);
+ _order2indicesReversedTet[_order] = indices;
+ it = _order2indicesReversedTet.find(_order);
}
indicesReversed &indices = it->second;
diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h
index c186a330d7..79409e7291 100644
--- a/Geo/MTetrahedron.h
+++ b/Geo/MTetrahedron.h
@@ -312,7 +312,7 @@ class MTetrahedron10 : public MTetrahedron {
typedef std::vector<int> indicesReversed;
class MTetrahedronN : public MTetrahedron {
- static std::map<int, indicesReversed> _order2indicesReversed;
+ static std::map<int, indicesReversed> _order2indicesReversedTet;
protected:
std::vector<MVertex *> _vs;
--
GitLab