Ignore:
Timestamp:
Aug 22, 2017, 7:31:52 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
9aaac6e9
Parents:
fc56cdbf (diff), b3d413b (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 references

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/ScrubTyVars.cc

    rfc56cdbf r8135d4c  
    1414//
    1515
    16 #include <sstream>
    17 #include <string>
     16#include <utility>                      // for pair
    1817
    19 #include "GenPoly.h"
     18#include "GenPoly.h"                    // for mangleType, TyVarMap, alignof...
     19#include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
    2020#include "ScrubTyVars.h"
    21 
    22 #include "SynTree/Mutator.h"
    23 #include "SynTree/Type.h"
    24 #include "SynTree/Expression.h"
     21#include "SynTree/Declaration.h"        // for TypeDecl, TypeDecl::Data, Typ...
     22#include "SynTree/Expression.h"         // for Expression (ptr only), NameExpr
     23#include "SynTree/Mutator.h"            // for Mutator
     24#include "SynTree/Type.h"               // for PointerType, TypeInstType, Type
    2525
    2626namespace GenPoly {
Note: See TracChangeset for help on using the changeset viewer.