Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
40be0338
Commit
40be0338
authored
Nov 17, 2014
by
kosak
Browse files
Remove special support for GTEST_OS_IOS_SIMULATOR.
parent
e330b754
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+1
-5
No files found.
include/gtest/internal/gtest-port.h
View file @
40be0338
...
@@ -126,7 +126,6 @@
...
@@ -126,7 +126,6 @@
// GTEST_OS_LINUX_ANDROID - Google Android
// GTEST_OS_LINUX_ANDROID - Google Android
// GTEST_OS_MAC - Mac OS X
// GTEST_OS_MAC - Mac OS X
// GTEST_OS_IOS - iOS
// GTEST_OS_IOS - iOS
// GTEST_OS_IOS_SIMULATOR - iOS simulator
// GTEST_OS_NACL - Google Native Client (NaCl)
// GTEST_OS_NACL - Google Native Client (NaCl)
// GTEST_OS_OPENBSD - OpenBSD
// GTEST_OS_OPENBSD - OpenBSD
// GTEST_OS_QNX - QNX
// GTEST_OS_QNX - QNX
...
@@ -322,9 +321,6 @@
...
@@ -322,9 +321,6 @@
# define GTEST_OS_MAC 1
# define GTEST_OS_MAC 1
# if TARGET_OS_IPHONE
# if TARGET_OS_IPHONE
# define GTEST_OS_IOS 1
# define GTEST_OS_IOS 1
# if TARGET_IPHONE_SIMULATOR
# define GTEST_OS_IOS_SIMULATOR 1
# endif
# endif
# endif
#elif defined __linux__
#elif defined __linux__
# define GTEST_OS_LINUX 1
# define GTEST_OS_LINUX 1
...
@@ -810,7 +806,7 @@ using ::std::tuple_size;
...
@@ -810,7 +806,7 @@ using ::std::tuple_size;
// abort() in a VC 7.1 application compiled as GUI in debug config
// abort() in a VC 7.1 application compiled as GUI in debug config
// pops up a dialog window that cannot be suppressed programmatically.
// pops up a dialog window that cannot be suppressed programmatically.
#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
(GTEST_OS_MAC && !GTEST_OS_IOS) ||
GTEST_OS_IOS_SIMULATOR ||
\
(GTEST_OS_MAC && !GTEST_OS_IOS) || \
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
GTEST_OS_OPENBSD || GTEST_OS_QNX)
GTEST_OS_OPENBSD || GTEST_OS_QNX)
...
...
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