Changeset 04273e9 for src/driver/cfa.cc


Ignore:
Timestamp:
Aug 8, 2016, 5:29:03 PM (9 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:
03da511
Parents:
0853178 (diff), 7bf7fb9 (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 ctor

Conflicts:

src/SymTab/Autogen.cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/driver/cfa.cc

    r0853178 r04273e9  
    1010// Created On       : Tue Aug 20 13:44:49 2002
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Aug  2 12:23:11 2016
    13 // Update Count     : 147
     12// Last Modified On : Sat Aug  6 16:14:55 2016
     13// Update Count     : 148
    1414//
    1515
    … …  
    8787        bool cpp_flag = false;                                                          // -E or -M flag, preprocessor only
    8888        bool std_flag = false;                                                          // -std= flag
    89         bool noincstd_flag = false;                                                     // -no-include-std= flag
     89        bool noincstd_flag = false;                                                     // -no-include-stdhdr= flag
    9090        bool debugging __attribute(( unused )) = false;         // -g flag
    9191
    … …  
    145145                        } else if ( arg == "-nohelp" ) {
    146146                                help = false;                                                   // strip the nohelp flag
    147                         } else if ( arg == "-no-include-std" ) {
    148                                 noincstd_flag = true;                                   // strip the no-include-std flag
     147                        } else if ( arg == "-no-include-stdhdr" ) {
     148                                noincstd_flag = true;                                   // strip the no-include-stdhdr flag
    149149                        } else if ( arg == "-compiler" ) {
    150150                                // use the user specified compiler
Note: See TracChangeset for help on using the changeset viewer.