Changeset 777ed2b for src/Common/PassVisitor.h

Timestamp:

Jul 11, 2018, 11:55:59 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (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 conflicts

File:

• src/Common/PassVisitor.h (modified) (4 diffs)

src/Common/PassVisitor.h

@@ -133 +133 @@
         virtual void visit( ArrayType * arrayType ) override final;
         virtual void visit( ReferenceType * referenceType ) override final;
+        virtual void visit( QualifiedType * qualType ) override final;
         virtual void visit( FunctionType * functionType ) override final;
         virtual void visit( StructInstType * aggregateUseType ) override final;
@@ -145 +146 @@
         virtual void visit( ZeroType * zeroType ) override final;
         virtual void visit( OneType * oneType ) override final;
+        virtual void visit( GlobalScopeType * globalType ) override final;
 
         virtual void visit( Designation * designation ) override final;
@@ -233 +235 @@
         virtual Type * mutate( ArrayType * arrayType ) override final;
         virtual Type * mutate( ReferenceType * referenceType ) override final;
+        virtual Type * mutate( QualifiedType * qualType ) override final;
         virtual Type * mutate( FunctionType * functionType ) override final;
         virtual Type * mutate( StructInstType * aggregateUseType ) override final;
@@ -245 +248 @@
         virtual Type * mutate( ZeroType * zeroType ) override final;
         virtual Type * mutate( OneType * oneType ) override final;
+        virtual Type * mutate( GlobalScopeType * globalType ) override final;
 
         virtual Designation * mutate( Designation * designation ) override final;