Changeset 23a08aa0 for src/ControlStruct/LabelFixer.cc

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

File:

• src/ControlStruct/LabelFixer.cc (modified) (1 diff)

src/ControlStruct/LabelFixer.cc

@@ -119 +119 @@
 
 // Builds a table that maps a label to its defining statement.
-std::map<Label, Statement * > * LabelFixer::resolveJumps() throw ( SemanticErrorException ) {
+std::map<Label, Statement * > * LabelFixer::resolveJumps() {
         std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
         for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {