From 97ea228532b0098a2175a0f6998eccb5575ce8f2 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 13 Dec 2012 10:49:10 +0000
Subject: [PATCH] BUG: Put NamedEnum names into Foam namespace
---
.../extendedFeatureEdgeMesh.C | 57 ++++++++++---------
1 file changed, 29 insertions(+), 28 deletions(-)
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index c6575f785a2..2a1539a6b49 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -39,42 +39,43 @@ License
defineTypeNameAndDebug(Foam::extendedFeatureEdgeMesh, 0);
-
-template<>
-const char* Foam::NamedEnum
-<
- Foam::extendedFeatureEdgeMesh::pointStatus,
- 4
->::names[] =
+namespace Foam
{
- "convex",
- "concave",
- "mixed",
- "nonFeature"
-};
+ template<>
+ const char* Foam::NamedEnum
+ <
+ Foam::extendedFeatureEdgeMesh::pointStatus,
+ 4
+ >::names[] =
+ {
+ "convex",
+ "concave",
+ "mixed",
+ "nonFeature"
+ };
+
+ template<>
+ const char* Foam::NamedEnum
+ <
+ Foam::extendedFeatureEdgeMesh::edgeStatus,
+ 6
+ >::names[] =
+ {
+ "external",
+ "internal",
+ "flat",
+ "open",
+ "multiple",
+ "none"
+ };
+}
const Foam::NamedEnum<Foam::extendedFeatureEdgeMesh::pointStatus, 4>
Foam::extendedFeatureEdgeMesh::pointStatusNames_;
-template<>
-const char* Foam::NamedEnum
-<
- Foam::extendedFeatureEdgeMesh::edgeStatus,
- 6
->::names[] =
-{
- "external",
- "internal",
- "flat",
- "open",
- "multiple",
- "none"
-};
-
const Foam::NamedEnum<Foam::extendedFeatureEdgeMesh::edgeStatus, 6>
Foam::extendedFeatureEdgeMesh::edgeStatusNames_;
-
Foam::scalar Foam::extendedFeatureEdgeMesh::cosNormalAngleTol_ =
Foam::cos(degToRad(0.1));
--
GitLab