Changeset ee6dbae for src/ResolvExpr

Timestamp:

Jul 11, 2019, 1:34:37 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

302d84c2, 7870799

Parents:

d6a8aef (diff), 1d760934 (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/ResolvExpr/ResolveAssertions.cc (modified) (2 diffs)

src/ResolvExpr/ResolveAssertions.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Oct 05 13:46:00 2018
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Oct 05 13:46:00 2018
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 10 16:10:37 2019
+// Update Count     : 2
 //
 
@@ -368 +368 @@
                 std::string resKey = SymTab::Mangler::mangleType( resType );
                 delete resType;
-                return std::move( resKey );
+                return resKey;
         }