Changeset 6840e7c for src/ResolvExpr/TypeEnvironment.h

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (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:

Merge branch 'master' into cleanup-dtors

File:

• src/ResolvExpr/TypeEnvironment.h (modified) (2 diffs)

src/ResolvExpr/TypeEnvironment.h

@@ -68 +68 @@
                 EqvClass &operator=( const EqvClass &other );
                 ~EqvClass();
-                void print( std::ostream &os, int indent = 0 ) const;
+                void print( std::ostream &os, Indenter indent = {} ) const;
         };
 
@@ -80 +80 @@
                 void makeSubstitution( TypeSubstitution &result ) const;
                 bool isEmpty() const { return env.empty(); }
-                void print( std::ostream &os, int indent = 0 ) const;
+                void print( std::ostream &os, Indenter indent = {} ) const;
                 void combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) );
                 void simpleCombine( const TypeEnvironment &second );