Changeset 3f869f0

Timestamp:

Jul 6, 2016, 6:11:51 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

99f11dd

Parents:

adcc065 (diff), 6a37d13 (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 conflicit

File:

• src/ControlStruct/MLEMutator.h (modified) (2 diffs)

src/ControlStruct/MLEMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul  6 16:49:52 2016
-// Update Count     : 31
+// Last Modified On : Wed Jul  6 18:10:49 2016
+// Update Count     : 32
 //
 
@@ -35 +35 @@
                 ~MLEMutator();
 
-                CompoundStmt *mutate( CompoundStmt *cmpndStmt );
+                virtual CompoundStmt *mutate( CompoundStmt *cmpndStmt ) override;
                 virtual Statement *mutate( WhileStmt *whileStmt ) override;
                 virtual Statement *mutate( ForStmt *forStmt ) override;
                 virtual Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError ) override;
-
-                virtual Statement *mutate( CaseStmt *caseStmt ) override;
                 virtual Statement *mutate( IfStmt *ifStmt ) override;
                 virtual Statement *mutate( SwitchStmt *switchStmt ) override;