Changeset 7c782af for src/Parser/LinkageSpec.h

Timestamp:

Feb 16, 2018, 4:22:25 PM (6 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:

5964127

Parents:

c71b256 (diff), 62cd621 (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/Parser/LinkageSpec.h (modified) (2 diffs)

src/Parser/LinkageSpec.h

@@ -17 +17 @@
 
 #include <string>
+
+#include "Common/CodeLocation.h"
 
 namespace LinkageSpec {
@@ -45 +47 @@
 
 
-        Spec linkageCheck( const std::string * );
+        Spec linkageCheck( CodeLocation location, const std::string * );
         // Returns the Spec with the given name (limited to C, Cforall & BuiltinC)
-        Spec linkageUpdate( Spec old_spec, const std::string * cmd );
+        Spec linkageUpdate( CodeLocation location, Spec old_spec, const std::string * cmd );
         /* If cmd = "C" returns a Spec that is old_spec with is_mangled = false
          * If cmd = "Cforall" returns old_spec Spec with is_mangled = true