Changeset 937e51d for src/Parser/lex.h

Timestamp:

Jun 26, 2015, 4:00:26 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pointer to pointer to qualified fix into master

File:

• src/Parser/lex.h (modified) (4 diffs)

src/Parser/lex.h

@@ -10 +10 @@
 // Created On       : Sat Sep 22 08:58:10 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 12:18:48 2015
-// Update Count     : 334
+// Last Modified On : Mon Jun  8 20:28:48 2015
+// Update Count     : 341
 //
 
@@ -18 +18 @@
 
 int yylex();
-void yyerror(char *);
+void yyerror( const char * );
 
 // External declarations for information sharing between lexer and scanner
@@ -35 +35 @@
 class Token {
   public:
-    std::string *str;
+    std::string *str;                                                                   // must be pointer as used in union
     Location loc;
 
@@ -44 +44 @@
 
 // Local Variables: //
-// fill-column: 110 //
 // tab-width: 4 //
 // mode: c++ //