Changeset 7c64920 for src/SynTree/Declaration.h

Timestamp:

May 25, 2015, 1:57:22 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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, string, with_gc

Children:

53a2e97

Parents:

5887db27

Message:

formatting

File:

• src/SynTree/Declaration.h (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 21 23:43:43 2015
-// Update Count     : 3
+<<<<<<< Updated upstream
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon May 25 13:54:32 2015
+=======
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu May 21 16:27:31 2015
+>>>>>>> Stashed changes
+// Update Count     : 5
 //
 
@@ -123 +128 @@
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
-    bool get_isInline() const { return isInline; }
-//    void set_isInline( bool newValue ) { isInline = newValue; }
+        bool get_isInline() const { return isInline; }
+//      void set_isInline( bool newValue ) { isInline = newValue; }
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }