Merge Request #48: Fix for foam-extend 4.0: support Flex 2.6.0, Author: Bruno Santos, Merge: Henrik Rusche

applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L

@@ -77,11 +77,11 @@ label currentTypei = -1;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-// #if YY_FLEX_SUBMINOR_VERSION < 34
-// extern "C" int yywrap()
-// #else
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+extern "C" int yywrap()
+#else
 int yyFlexLexer::yywrap()
-// #endif
+#endif
 {
     return 1;
 }

applications/utilities/mesh/conversion/fluent3DMeshToElmer/fluent3DMeshToElmer.L

@@ -125,11 +125,11 @@ void uniquify(word& name, HashSet<word>& patchNames)
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-// #if YY_FLEX_SUBMINOR_VERSION < 34
-// extern "C" int yywrap()
-// #else
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+extern "C" int yywrap()
+#else
 int yyFlexLexer::yywrap()
-// #endif
+#endif
 {
     return 1;
 }

applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L

@@ -124,7 +124,7 @@ void uniquify(word& name, HashSet<word>& patchNames)
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()

applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L

@@ -103,7 +103,7 @@ wordList patchNameIDs(maxZoneID);
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()

applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L

@@ -81,11 +81,11 @@ label nValuesForPatchFaces = 0;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-// #if YY_FLEX_SUBMINOR_VERSION < 34
-// extern "C" int yywrap()
-// #else
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+extern "C" int yywrap()
+#else
 int yyFlexLexer::yywrap()
-// #endif
+#endif
 {
     return 1;
 }

applications/utilities/preProcessing/fluentDataToFoam/fluentDataToFoam.L

@@ -77,7 +77,7 @@ SLPtrList<FieldField<Field, scalar> > zoneData;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()

src/meshTools/triSurface/triSurface/interfaces/STL/readSTLASCII.L

@@ -53,11 +53,11 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! @cond dummy
-// #if YY_FLEX_SUBMINOR_VERSION < 34
-// extern "C" int yywrap()
-// #else
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+extern "C" int yywrap()
+#else
 int yyFlexLexer::yywrap()
-// #endif
+#endif
 {
     return 1;
 }

src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L

@@ -50,7 +50,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! @cond dummy
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()

src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L

@@ -54,7 +54,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! @cond dummy
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()