Changeset 11054 for code/branches/cpp11_v3/src/libraries/util/ExprParser.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/libraries/util/ExprParser.cc (modified) (2 diffs)

code/branches/cpp11_v3/src/libraries/util/ExprParser.cc

@@ -391 +391 @@
     }
 
-    char* ExprParser::parse_word(char* str)
+    void ExprParser::parse_word(char* str)
     {
         char* word = str;
@@ -402 +402 @@
             {
                 this->failed_ = true;
-                return '\0';
+                return;
             }
         };
         *word = '\0';
-        return str;
     }