Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
7489581d
Commit
7489581d
authored
Jan 08, 2015
by
kosak
Browse files
Fix build of Objective-C++ files with new clang versions.
parent
12ab6bb1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+5
-0
No files found.
include/gtest/internal/gtest-port.h
View file @
7489581d
...
@@ -498,6 +498,11 @@ struct _RTL_CRITICAL_SECTION;
...
@@ -498,6 +498,11 @@ struct _RTL_CRITICAL_SECTION;
# define _HAS_EXCEPTIONS 1
# define _HAS_EXCEPTIONS 1
# endif // _HAS_EXCEPTIONS
# endif // _HAS_EXCEPTIONS
# define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
# define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
# elif defined(__clang__)
// __EXCEPTIONS determines if cleanups are enabled. In Obj-C++ files, there can
// be cleanups for ObjC exceptions, but C++ exceptions might still be disabled.
// So use a __has_feature check for C++ exceptions instead.
# define GTEST_HAS_EXCEPTIONS __has_feature(cxx_exceptions)
# elif defined(__GNUC__) && __EXCEPTIONS
# elif defined(__GNUC__) && __EXCEPTIONS
// gcc defines __EXCEPTIONS to 1 iff exceptions are enabled.
// gcc defines __EXCEPTIONS to 1 iff exceptions are enabled.
# define GTEST_HAS_EXCEPTIONS 1
# define GTEST_HAS_EXCEPTIONS 1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment