Changeset 353d168 for src/Parser/LinkageSpec.h

Timestamp:

Aug 19, 2015, 3:59:45 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, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

830c21a

Parents:

18997b9 (diff), 4aa0858 (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 'override-autogen' into ctor

Conflicts:

src/Parser/ParseNode.h

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 : Peter A. Buhr
-// Last Modified On : Sat May 16 13:26:14 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Aug 18 14:11:55 2015
+// Update Count     : 5
 //
 
@@ -34 +34 @@
         static bool isGeneratable( Type );
         static bool isOverloadable( Type );
+        static bool isOverridable( Type );
         static bool isBuiltin( Type );
 };