diff options
| author | Eli Bendersky <eliben@chromium.org> | 2013-07-15 16:08:08 -0700 |
|---|---|---|
| committer | Eli Bendersky <eliben@chromium.org> | 2013-07-15 16:08:08 -0700 |
| commit | e789858899a7b36caf11b371a97411a1582a482b (patch) | |
| tree | e8c28b178b32010f73b477b3c65b5ff74437530c /test/Modules/module-private.cpp | |
| parent | 99a5501f5ae5b75017dfc386d4abf648234e85df (diff) | |
| parent | 20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8 (diff) | |
Merge commit '20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8'
Conflicts:
lib/CodeGen/ItaniumCXXABI.cpp
Diffstat (limited to 'test/Modules/module-private.cpp')
| -rw-r--r-- | test/Modules/module-private.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Modules/module-private.cpp b/test/Modules/module-private.cpp index d4e73b5396..438dcab984 100644 --- a/test/Modules/module-private.cpp +++ b/test/Modules/module-private.cpp @@ -15,7 +15,7 @@ int test_broken() { HiddenStruct hidden; // \ // expected-error{{must use 'struct' tag to refer to type 'HiddenStruct' in this scope}} \ // expected-error{{definition of 'struct HiddenStruct' must be imported}} - // expected-note@3 {{previous definition is here}} + // expected-note@Inputs/module_private_left.h:3 {{previous definition is here}} Integer i; // expected-error{{unknown type name 'Integer'}} |