diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-12-08 11:45:06 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-12-08 11:45:06 +0100 |
| commit | 918a0d4311cc1d1766b579509c16ac9fcfbc7807 (patch) | |
| tree | 208801b1cf6204c078579423f5be51a2ebaa59db /include/clang/Sema/Scope.h | |
| parent | bee2507b6a87a0add267d6e846a112a8c468b195 (diff) | |
| parent | 9b65aea27ca3f915d8d197db494b4caccc745d3c (diff) | |
| download | clang-918a0d4311cc1d1766b579509c16ac9fcfbc7807.tar.gz clang-918a0d4311cc1d1766b579509c16ac9fcfbc7807.tar.bz2 clang-918a0d4311cc1d1766b579509c16ac9fcfbc7807.tar.xz | |
Merge branch 'release-3.2' into embtk-support-release-3.2
Diffstat (limited to 'include/clang/Sema/Scope.h')
| -rw-r--r-- | include/clang/Sema/Scope.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/clang/Sema/Scope.h b/include/clang/Sema/Scope.h index fa508cfc22..1329f97c2b 100644 --- a/include/clang/Sema/Scope.h +++ b/include/clang/Sema/Scope.h @@ -84,11 +84,18 @@ public: /// TryScope - This is the scope of a C++ try statement. TryScope = 0x1000, + /// CatchScope - This is the scope of a C++ catch statement. + CatchScope = 0x2000, + + /// FnTryCatchScope - This is the scope for a function-level C++ try or + /// catch scope. + FnTryCatchScope = 0x4000, + /// FnTryScope - This is the scope of a function-level C++ try scope. - FnTryScope = 0x3000, + FnTryScope = TryScope | FnTryCatchScope, /// FnCatchScope - This is the scope of a function-level C++ catch scope. - FnCatchScope = 0x4000 + FnCatchScope = CatchScope | FnTryCatchScope }; private: /// The parent scope for this scope. This is null for the translation-unit |