Changeset 370f6ef for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Feb 18, 2018, 9:33:18 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

23a1eb7b

Parents:

2b95887 (diff), 29f47139 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 28 13:47:24 2017
-// Update Count     : 32
+// Last Modified On : Sat Feb 17 11:19:39 2018
+// Update Count     : 33
 //
 
@@ -255 +255 @@
                                 stream << "Cannot choose between " << winners.size() << " alternatives for expression\n";
                                 expr->print( stream );
-                                stream << "Alternatives are:\n";
+                                stream << " Alternatives are:\n";
                                 printAlts( winners, stream, 1 );
                                 throw SemanticError( expr->location, stream.str() );