Updated .L files to assign properly the function 'yywrap()' for Flex 2.6.0 and newer.
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:
parent
54c9f83b54
commit
47faa3bad1
9 changed files with 21 additions and 21 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
Reference in a new issue