Ignore:
Timestamp:
Feb 8, 2016, 10:07:42 AM (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:
c44e622
Parents:
00ede9e (diff), bd85400 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/AlternativeFinder.h

    r00ede9e rd41280e  
    5656                virtual void visit( ConstantExpr *constantExpr );
    5757                virtual void visit( SizeofExpr *sizeofExpr );
    58                 virtual void visit( AlignofExpr *sizeofExpr );
     58                virtual void visit( AlignofExpr *alignofExpr );
     59                virtual void visit( UntypedOffsetofExpr *offsetofExpr );
     60                virtual void visit( OffsetofExpr *offsetofExpr );
    5961                virtual void visit( AttrExpr *attrExpr );
    6062                virtual void visit( LogicalExpr *logicalExpr );
     
    6769
    6870          private:
     71                /// Adds alternatives for member expressions, given the aggregate, conversion cost for that aggregate, and name of the member
    6972                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const std::string &name );
     73                /// Adds alternatives for offsetof expressions, given the base type and name of the member
     74                template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );
    7075                bool instantiateFunction( std::list< DeclarationWithType* >& formals, /*const*/ AltList &actuals, bool isVarArgs, OpenVarSet& openVars, TypeEnvironment &resultEnv, AssertionSet &resultNeed, AssertionSet &resultHave );
    7176                template< typename OutputIterator >
Note: See TracChangeset for help on using the changeset viewer.