Changeset b067d9b for src/Parser/LinkageSpec.h

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 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:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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/Parser/LinkageSpec.h (modified) (3 diffs)

src/Parser/LinkageSpec.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:24:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:32:16 2017
-// Update Count     : 14
+// Last Modified On : Wed Jul 10 16:02:34 2019
+// Update Count     : 18
 //
 
@@ -22 +22 @@
 namespace LinkageSpec {
         // All linkage specs are some combination of these flags:
-        enum {
-                Mangle = 1 << 0,
-                Generate = 1 << 1,
-                Overrideable = 1 << 2,
-                Builtin = 1 << 3,
-                GccBuiltin = 1 << 4,
-
-                NoOfSpecs = 1 << 5,
-        };
+        enum { Mangle = 1 << 0, Generate = 1 << 1, Overrideable = 1 << 2, Builtin = 1 << 3, GccBuiltin = 1 << 4, NoOfSpecs = 1 << 5, };
 
         union Spec {
@@ -42 +34 @@
                 };
                 constexpr Spec( unsigned int val ) : val( val ) {}
-                constexpr Spec( Spec const &other ) : val( other.val ) {}
+                constexpr Spec( Spec const & other ) : val( other.val ) {}
+                constexpr Spec & operator=( const Spec & ) = default;
                 // Operators may go here.
                 // Supports == and !=
-                constexpr operator unsigned int () const { return val; }
+                constexpr operator unsigned int() const { return val; }
         };
 
 
-        Spec linkageCheck( CodeLocation location, const std::string * );
-        // Returns the Spec with the given name (limited to C, Cforall & BuiltinC)
         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