diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2015-09-01 13:24:39 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2015-09-01 13:24:39 +0000 |
| commit | 6a4a210126264ad0f947c4ca5361e8530bf4e877 (patch) | |
| tree | 8889459e282da024ed437c5beed5c9f9750d1a6d /clang/test/Modules/merge-using-decls.cpp | |
| parent | 3b138079c9624c10c63ca858e48b68eed698b9b6 (diff) | |
| download | bcm5719-llvm-6a4a210126264ad0f947c4ca5361e8530bf4e877.tar.gz bcm5719-llvm-6a4a210126264ad0f947c4ca5361e8530bf4e877.zip | |
Reverting r246497 (which requires also reverting r246524 and r246521 to avoid merge conflicts). It broke the build on MSVC 2015. It also broke an MSVC 2013 bot with testing issues.
llvm\tools\clang\lib\serialization\MultiOnDiskHashTable.h(117):
error C2065: 'Files': undeclared identifier
http://bb.pgr.jp/builders/ninja-clang-i686-msc18-R/builds/2917
llvm-svn: 246546
Diffstat (limited to 'clang/test/Modules/merge-using-decls.cpp')
| -rw-r--r-- | clang/test/Modules/merge-using-decls.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/clang/test/Modules/merge-using-decls.cpp b/clang/test/Modules/merge-using-decls.cpp index 98989d12f98..789f75b5740 100644 --- a/clang/test/Modules/merge-using-decls.cpp +++ b/clang/test/Modules/merge-using-decls.cpp @@ -31,8 +31,6 @@ template int UseAll<YA>(); template int UseAll<YB>(); template int UseAll<Y>(); -// Which of these two sets of diagnostics is chosen is not important. It's OK -// if this varies with ORDER, but it must be consistent across runs. #if ORDER == 1 // Here, we're instantiating the definition from 'A' and merging the definition // from 'B' into it. |
