Changeset f80e0218 for src/ResolvExpr/typeops.h

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/ResolvExpr/typeops.h (modified) (1 diff)

src/ResolvExpr/typeops.h

@@ -54 +54 @@
   
         // in AdjustExprType.cc
+        /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function
         void adjustExprType( Type *&type, const TypeEnvironment &env, const SymTab::Indexer &indexer );