From c72c57c9e9b69944e3e009cd5e209634839581d3 Mon Sep 17 00:00:00 2001 From: dim Date: Mon, 8 Apr 2013 18:45:10 +0000 Subject: Vendor import of clang trunk r178860: http://llvm.org/svn/llvm-project/cfe/trunk@178860 --- test/ASTMerge/class.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'test/ASTMerge/class.cpp') diff --git a/test/ASTMerge/class.cpp b/test/ASTMerge/class.cpp index 114687f..885b65e 100644 --- a/test/ASTMerge/class.cpp +++ b/test/ASTMerge/class.cpp @@ -1,9 +1,14 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/class1.cpp // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/class2.cpp // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 -Wno-odr | count 0 // CHECK: class1.cpp:5:8: warning: type 'B' has incompatible definitions in different translation units // CHECK: class1.cpp:6:9: note: field 'y' has type 'float' here // CHECK: class2.cpp:6:7: note: field 'y' has type 'int' here // FIXME: we should also complain about mismatched types on the method + +// CHECK: class1.cpp:17:6: warning: type 'E' has incompatible definitions in different translation units +// CHECK: class1.cpp:18:3: note: enumerator 'b' with value 1 here +// CHECK: class2.cpp:11:3: note: enumerator 'a' with value 0 here -- cgit v1.1