Changeset 0a73148 for src/Common/SemanticError.h

Timestamp:

Jul 13, 2018, 6:36:34 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

6da49249

Parents:

6b8b767 (diff), ae144af (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:

fix conflict

File:

• src/Common/SemanticError.h (modified) (2 diffs)

src/Common/SemanticError.h

@@ -56 +56 @@
         {"reference-conversion"   , "rvalue to reference conversion of rvalue: %s" , Severity::Warn},
         {"qualifiers-zero_t-one_t", "questionable use of type qualifier %s with %s", Severity::Warn},
+        {"aggregate-forward-decl" , "forward declaration of nested aggregate: %s"  , Severity::Warn},
 };
 
@@ -62 +63 @@
         RvalueToReferenceConversion,
         BadQualifiersZeroOne,
+        AggrForwardDecl,
         NUMBER_OF_WARNINGS, //This MUST be the last warning
 };