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 | 1b257afbae854c6817f26b7d61c4fed8ff7aebad (patch) | |
| tree | b55dde41e149b05234a21023307864c49b380144 /include/clang/Basic | |
| parent | bd5da3ca593fbf354fd19c2894eee50694c96788 (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 'include/clang/Basic')
| -rw-r--r-- | include/clang/Basic/IdentifierTable.h | 4 | ||||
| -rw-r--r-- | include/clang/Basic/TokenKinds.def | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h index 9ad3f49bde..34e2346820 100644 --- a/include/clang/Basic/IdentifierTable.h +++ b/include/clang/Basic/IdentifierTable.h @@ -297,11 +297,11 @@ public: } /// \brief Determine whether this is the contextual keyword - /// '__experimental_modules_import'. + /// 'import'. bool isModulesImport() const { return IsModulesImport; } /// \brief Set whether this identifier is the contextual keyword - /// '__experimental_modules_import'. + /// 'import'. void setModulesImport(bool I) { IsModulesImport = I; if (I) diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def index 25e8d5a635..f02ba6438b 100644 --- a/include/clang/Basic/TokenKinds.def +++ b/include/clang/Basic/TokenKinds.def @@ -566,7 +566,7 @@ OBJC2_AT_KEYWORD(required) OBJC2_AT_KEYWORD(optional) OBJC2_AT_KEYWORD(synthesize) OBJC2_AT_KEYWORD(dynamic) -OBJC2_AT_KEYWORD(__experimental_modules_import) +OBJC2_AT_KEYWORD(import) // TODO: What to do about context-sensitive keywords like: // bycopy/byref/in/inout/oneway/out? |