Changeset a1b154d for src/AST/Decl.cpp

Timestamp:

May 21, 2019, 4:53:35 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

907c545

Parents:

5b35c21 (diff), 514a791 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/Decl.cpp (modified) (2 diffs)

src/AST/Decl.cpp

@@ -81 +81 @@
                                 auto result = eval( init->value );
                                 if ( ! result.second ) {
-                                        SemanticError( init->location, toString( "Non-constexpr in initialization of "
+                                        SemanticError( init->location, ::toString( "Non-constexpr in initialization of "
                                                 "enumerator: ", field ) );
                                 }
@@ -87 +87 @@
                         }
                         if ( enumValues.count( field->name ) != 0 ) {
-                                SemanticError( location, toString( "Enum ", name, " has multiple members with the "     "name ", field->name ) );
+                                SemanticError( location, ::toString( "Enum ", name, " has multiple members with the "   "name ", field->name ) );
                         }
                         enumValues[ field->name ] = crntVal;