Changeset 6d2aa7e


Ignore:
Timestamp:
Apr 16, 2018, 4:24:41 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
61323a7
Parents:
6040e67d
Message:

Missed one conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Common/SemanticError.h

    r6040e67d r6d2aa7e  
    6565);
    6666
    67 <<<<<<< Updated upstream
    68 // ## used here to allow empty __VA_ARGS__
    69 #define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], ## __VA_ARGS__)
    70 =======
    7167#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, __VA_ARGS__)
    72 >>>>>>> Stashed changes
    7368
    7469void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));
Note: See TracChangeset for help on using the changeset viewer.