exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated .L files to assign properly the function 'yywrap()' for Flex 2.6.0 and newer.

Browse source 
Nonetheless, keep in mind that this isn't general enough, since this will again have future issues with Flex 3.0, if and when that time comes.

Note: Used the same fix from OpenFOAM-dev, commit a4eabffbacfa8e4648f044e3d4c2a74d722a2b47.
This commit is contained in:
wyldckat 2016-08-25 19:11:41 +01:00
parent 54c9f83b54
commit 47faa3bad1
9 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
View file

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

8
applications/utilities/mesh/conversion/fluent3DMeshToElmer/fluent3DMeshToElmer.L
View file

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

2
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View file

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

2
applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
View file

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

8
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
View file

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

2
applications/utilities/preProcessing/fluentDataToFoam/fluentDataToFoam.L
View file

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

8
src/meshTools/triSurface/triSurface/interfaces/STL/readSTLASCII.L
View file

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

2
src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
View file

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

2
src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
View file

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