Ignore:
Timestamp:
May 16, 2018, 1:32:01 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, with_gc
Children:
c1ec14f
Parents:
bd6e226 (diff), e9a7e90b (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/DeclarationNode.cc

    rbd6e226 r099e202  
    1010// Created On       : Sat May 16 12:34:05 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Apr 26 13:45:10 2018
    13 // Update Count     : 1064
     12// Last Modified On : Wed May 16 09:37:17 2018
     13// Update Count     : 1070
    1414//
    1515
     
    529529
    530530DeclarationNode * DeclarationNode::addQualifiers( DeclarationNode * q ) {
    531         if ( ! q ) { delete q; return this; }                           // empty qualifier
     531        if ( ! q ) { return this; }                                                     // empty qualifier
    532532
    533533        checkSpecifiers( q );
     
    563563
    564564        checkQualifiers( type, q->type );
    565         if ( (builtin == Zero || builtin == One) && error.length() == 0 ) {
     565        if ( (builtin == Zero || builtin == One) && q->type->qualifiers.val != 0 && error.length() == 0 ) {
    566566                SemanticWarning( yylloc, Warning::BadQualifiersZeroOne, Type::QualifiersNames[ilog2( q->type->qualifiers.val )], builtinTypeNames[builtin] );
    567 //              appendError( error, string( "questionable qualifiers" ) );
    568567        } // if
    569568        addQualifiersToType( q->type, type );
Note: See TracChangeset for help on using the changeset viewer.