aboutsummaryrefslogtreecommitdiff
path: root/test/Modules/submodules.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2012-12-11 22:11:52 +0000
committerDouglas Gregor <dgregor@apple.com>2012-12-11 22:11:52 +0000
commit1b257afbae854c6817f26b7d61c4fed8ff7aebad (patch)
treeb55dde41e149b05234a21023307864c49b380144 /test/Modules/submodules.cpp
parentbd5da3ca593fbf354fd19c2894eee50694c96788 (diff)
Use @import rather than @__experimental_modules_import, since the
latter is rather a mess to type. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169919 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Modules/submodules.cpp')
-rw-r--r--test/Modules/submodules.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/Modules/submodules.cpp b/test/Modules/submodules.cpp
index 60d5ae0c22..1417446416 100644
--- a/test/Modules/submodules.cpp
+++ b/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;