Changeset 6d2aa7ed

Timestamp:

Apr 16, 2018, 4:24:41 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

61323a7

Parents:

6040e67d

Message:

Missed one conflict

File:

• src/Common/SemanticError.h (modified) (1 diff)

src/Common/SemanticError.h

@@ -65 +65 @@
 );
 
-<<<<<<< Updated upstream
-// ## used here to allow empty __VA_ARGS__
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], ## __VA_ARGS__)
-=======
 #define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, __VA_ARGS__)
->>>>>>> Stashed changes
 
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));