diff options
author | Douglas Gregor <dgregor@apple.com> | 2012-12-11 22:11:52 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2012-12-11 22:11:52 +0000 |
commit | c50d4924eb2e84f5b2d9a39ab828410624f27643 (patch) | |
tree | 41595167dda1e9644cc359f865e63de151bc25d4 /clang/test/Modules/submodules.cpp | |
parent | b798fc98491be64027818fd2362e1896a9935903 (diff) | |
download | bcm5719-llvm-c50d4924eb2e84f5b2d9a39ab828410624f27643.tar.gz bcm5719-llvm-c50d4924eb2e84f5b2d9a39ab828410624f27643.zip |
Use @import rather than @__experimental_modules_import, since the
latter is rather a mess to type.
llvm-svn: 169919
Diffstat (limited to 'clang/test/Modules/submodules.cpp')
-rw-r--r-- | clang/test/Modules/submodules.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/test/Modules/submodules.cpp b/clang/test/Modules/submodules.cpp index 60d5ae0c22f..1417446416c 100644 --- a/clang/test/Modules/submodules.cpp +++ b/clang/test/Modules/submodules.cpp @@ -2,7 +2,7 @@ // RUN: %clang_cc1 -x objective-c++ -fmodule-cache-path %t -fmodules -I %S/Inputs/submodules %s -verify // FIXME: When we have a syntax for modules in C++, use that. -@__experimental_modules_import std.vector; +@import std.vector; vector<int> vi; @@ -10,20 +10,20 @@ vector<int> vi; remove_reference<int&>::type *int_ptr = 0; // expected-error{{unknown type name 'remove_reference'}} \ // expected-error{{expected unqualified-id}} -@__experimental_modules_import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}} +@import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}} vector<float> vf; remove_reference<int&>::type *int_ptr2 = 0; -@__experimental_modules_import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}} +@import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}} -@__experimental_modules_import std; // import everything in 'std' +@import std; // import everything in 'std' // hash_map still isn't available. hash_map<int, float> ints_to_floats; // expected-error{{unknown type name 'hash_map'}} \ // expected-error{{expected unqualified-id}} -@__experimental_modules_import std.hash_map; +@import std.hash_map; hash_map<int, float> ints_to_floats2; |