From: bangerth Date: Fri, 19 Oct 2012 22:38:15 +0000 (+0000) Subject: Correct source code for a compiler built to support C++11 where a lot of the stuff... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f176152ca32eb455493fe632aea11d866a17c9f;p=dealii-svn.git Correct source code for a compiler built to support C++11 where a lot of the stuff like 'o'l5 was interpreted as a new-type C++ user-defined literal. git-svn-id: https://svn.dealii.org/branches/branch_cmake@27149 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/bundled/functionparser/extrasrc/fp_identifier_parser.inc b/deal.II/bundled/functionparser/extrasrc/fp_identifier_parser.inc index 00d5081a7f..edc37b78e9 100644 --- a/deal.II/bundled/functionparser/extrasrc/fp_identifier_parser.inc +++ b/deal.II/bundled/functionparser/extrasrc/fp_identifier_parser.inc @@ -138,8 +138,8 @@ to be modified by hand. #define lO l3 lH #define lN switch( #define lM l4 lH -#define lL if('i'l5 -#define lK 'n'l5 +#define lL if('i' l5 +#define lK 'n' l5 #define lJ 0x80000003U; #define lI l1 3]={ #define lH case @@ -150,8 +150,8 @@ to be modified by hand. #define lC l2 3 lF #define lB lA 1]){lH #define lA :lN uptr[ -#define l9 'a'lB -#define l8 default:l0 +#define l9 'a' lB +#define l8 default: l0 #define l7 lG l0 5;}lH #define l6 <<16)| #define l5 ==uptr[ @@ -163,7 +163,7 @@ to be modified by hand. lN nameLength){lH 2:lL -0]&&'f'l5 +0]&&'f' l5 1])l0(cIf l6 0x80000002U;l0 @@ -171,55 +171,55 @@ l6 3 lA 0]){lH -l9'b':if('s'l5 +l9 'b' :if('s' l5 2])l0(cAbs l6 -lM'r':if('g'l5 +lM'r' :if('g' l5 2])l0(cArg l6 l4 -lE'c'lB'o'lA +lE 'c' lB 'o' lA 2]){lH's':l0(cCos l6 lJ -lH't':l0(cCot +lH 't':l0(cCot l6 lJ -lE's':if('c'l5 -2])l0(cCsc +lE 's' :if('c' l5 +2]) l0 (cCsc l6 l4 -lE'e':if('x'l5 -1]&&'p'l5 +lE 'e' :if('x' l5 +1]&&'p' l5 2])l0(cExp l6 lM'i':if(lK -1]&&'t'l5 +1]&&'t' l5 2])l0(cInt l6 -lM'l':if('o'l5 -1]&&'g'l5 +lM'l':if('o' l5 +1]&&'g' l5 2])l0(cLog l6 -lM'm'lB'a':if('x'l5 +lM 'm' lB 'a' :if('x' l5 2])l0(cMax l6 -lM'i':if(lK +lM 'i' : if(lK 2])l0(cMin l6 l4 -lE'p':if('o'l5 -1]&&'w'l5 +lE'p':if('o' l5 +1]&&'w' l5 2])l0(cPow l6 -lM's'lB'e':if('c'l5 +lM 's' lB 'e':if('c' l5 2])l0(cSec l6 -lM'i':if(lK -2])l0(cSin +lM 'i' :if(lK +2]) l0 (cSin l6 l4 -lE't':if('a'l5 +lE't':if('a' l5 1]&&lK 2])l0(cTan l6 @@ -228,34 +228,34 @@ lE 4 lA 0]){lH -l9'c':if('o'l5 -2]&&'s'l5 -3])l0(cAcos +l9 'c' : if('o' l5 +2] && 's' l5 +3]) l0 (cAcos l6 lO's':lL 2]&&lK 3])l0(cAsin l6 -lO't':if('a'l5 +lO't':if('a' l5 2]&&lK 3])l0(cAtan l6 l3 l8 4;} -lH'c'lB'b':if('r'l5 -2]&&'t'l5 +lH 'c' lB 'b' :if('r' l5 +2]&&'t' l5 3])l0(cCbrt l6 -lO'e':lL -2]&&'l'l5 +lO 'e' :lL +2] && 'l' l5 3])l0(cCeil l6 -lO'o'lA -2]){lH'n':if('j'l5 +lO 'o' lA +2]){ lH 'n' : if('j' l5 3])l0(cConj l6 -lO's':if('h'l5 +lO's':if('h' l5 3])l0(cCosh l6 l3 @@ -263,32 +263,32 @@ l8 4;} l8 4;} -lH'e':{lI'x','p','2'} +lH 'e' :{ lI 'x' , 'p' , '2'} ;if(lC cExp2 l6 l3} -lH'i':{lI'm','a','g'} +lH'i':{lI 'm','a','g'} ;if(lC cImag l6 l3} -lH'l':{lI'o','g','2'} +lH 'l':{lI 'o','g','2'} ;if(lC cLog2 l6 l3} -lH'r':{lI'e','a','l'} +lH 'r':{ lI 'e','a','l'} ;if(lC cReal l6 l3} -lH's'lB'i':if(lK -2]&&'h'l5 +lH 's' lB 'i' :if(lK +2]&&'h' l5 3])l0(cSinh l6 -lO'q':if('r'l5 -2]&&'t'l5 +lO'q':if('r' l5 +2]&&'t' l5 3])l0(cSqrt l6 l3 @@ -317,7 +317,7 @@ l7's':{lI'i','n','h'} lF cAsinh l6 -l7't':if('a'l5 +l7't':if('a' l5 2]){if(lK 3]){lN uptr[4]){lH'2':l0(cAtan2 @@ -376,4 +376,4 @@ l8 5;} default:break;} l0 -nameLength; \ No newline at end of file +nameLength; diff --git a/deal.II/bundled/functionparser/fpoptimizer.cc b/deal.II/bundled/functionparser/fpoptimizer.cc index 7c41f511ca..24204bc57f 100644 --- a/deal.II/bundled/functionparser/fpoptimizer.cc +++ b/deal.II/bundled/functionparser/fpoptimizer.cc @@ -2008,7 +2008,7 @@ tG3:p="ParamHolder" SubFunction:p="SubFunction" ;yF3 std::ostringstream -tmp;assert(p);tmp<