No commit message

melstav · May 4, 2014 · e53f157 · e53f157
1 parent be87796
commit e53f157
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/muParserBase.cpp b/src/muParserBase.cpp
@@ -701,7 +701,7 @@ namespace mu
       // because it deletes the array with the used variables
       m_pParseFormula = &ParserBase::ParseString;
       m_pTokenReader->IgnoreUndefVar(false);
-      throw e;
+      throw;
     }
 
     return m_pTokenReader->GetUsedVar();
@@ -1730,13 +1730,13 @@ namespace mu
     #endif
 
     int nMaxThreads = std::min(omp_get_max_threads(), s_MaxNumOpenMPThreads);
-    int nThreadID, ct=0;
+    int ct=0;
     omp_set_num_threads(nMaxThreads);
 
     #pragma omp parallel for schedule(static, nBulkSize/nMaxThreads) private(nThreadID)
     for (i=0; i<nBulkSize; ++i)
     {
-      nThreadID = omp_get_thread_num();
+      int nThreadID = omp_get_thread_num();
       results[i] = ParseCmdCodeBulk(i, nThreadID);
 
       #ifdef DEBUG_OMP_STUFF

diff --git a/src/muParserTest.cpp b/src/muParserTest.cpp
@@ -1180,9 +1180,9 @@ namespace mu
       try
       {
         Parser  p;
+        value_type var = 0;
 
         // variable
-        value_type var = 0;
         p.DefineVar( _T("a"), &var);
         p.SetExpr(a_str);
 

diff --git a/src/muParserTokenReader.cpp b/src/muParserTokenReader.cpp
@@ -255,7 +255,6 @@ namespace mu
   {
     assert(m_pParser);
 
-    std::stack<int> FunArgs;
     const char_type *szFormula = m_strFormula.c_str();
     token_type tok;
 
@@ -656,7 +655,7 @@ namespace mu
         }
 
         m_iPos += (int)sID.length();
-        m_iSynFlags  = noBC | noOPT | noARG_SEP | noPOSTOP | noEND | noBC | noASSIGN;
+        m_iSynFlags  = noBC | noOPT | noARG_SEP | noPOSTOP | noEND | noASSIGN;
         return true;
       }
     }