Changeset 04cdd9b for src/Parser/LinkageSpec.h

Timestamp:

Aug 19, 2016, 2:42:04 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

e85a8631

Parents:

03da511 (diff), ac71a86 (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' into ctor

File:

• src/Parser/LinkageSpec.h (modified) (2 diffs)

src/Parser/LinkageSpec.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Aug 18 14:11:55 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:47:16 2016
+// Update Count     : 7
 //
 
@@ -20 +20 @@
 
 struct LinkageSpec {
-        enum Type {
+        enum Spec {
                 Intrinsic,                                                                              // C built-in defined in prelude
                 Cforall,                                                                                // ordinary
                 C,                                                                                              // not overloadable, not mangled
                 AutoGen,                                                                                // built by translator (struct assignment)
-                Compiler                                                                                // gcc internal
+                Compiler,                                                                               // gcc internal
+                NoOfSpecs
         };
   
-        static Type fromString( const std::string & );
-        static std::string toString( Type );
+        static Spec fromString( const std::string & );
+        static std::string toString( Spec );
   
-        static bool isDecoratable( Type );
-        static bool isGeneratable( Type );
-        static bool isOverloadable( Type );
-        static bool isOverridable( Type );
-        static bool isBuiltin( Type );
+        static bool isDecoratable( Spec );
+        static bool isGeneratable( Spec );
+        static bool isOverloadable( Spec );
+        static bool isOverridable( Spec );
+        static bool isBuiltin( Spec );
 };