Changeset 92538ab for src/ControlStruct/LabelGeneratorNew.hpp

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• src/ControlStruct/LabelGeneratorNew.hpp (modified) (2 diffs)

src/ControlStruct/LabelGeneratorNew.hpp

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 18:03:09 2022
-// Update Count     : 27
+// Last Modified By : Andrew Beach
+// Last Modified On : Fir Mar 25 15:40:00 2022
+// Update Count     : 28
 //
 
@@ -18 +18 @@
 #include <string>                                                                               // for string
 
-class Statement;
+class CodeLocation;
 
 namespace ast {
+        class Label;
         class Stmt;
-        class Label;
 } // namespace ast
 
 namespace ControlStruct {
         ast::Label newLabel( const std::string &, const ast::Stmt * );
+        ast::Label newLabel( const std::string &, const CodeLocation & );
 } // namespace ControlStruct