commit 40be033887b7728d70d47adce581a971371ee705
author kosak <kosak@google.com> Mon Nov 17 02:38:21 2014 +0000
committer kosak <kosak@google.com> Mon Nov 17 02:38:21 2014 +0000
tree 418613936997e0e8ea40e19cbaa00f4454e46e20
parent e330b754cbd4b23a160521e05ff1014ed576378b

Remove special support for GTEST_OS_IOS_SIMULATOR.

include/gtest/internal/gtest-port.h

diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index 9e0d6ef..6009247 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -126,7 +126,6 @@
 //     GTEST_OS_LINUX_ANDROID - Google Android
 //   GTEST_OS_MAC      - Mac OS X
 //     GTEST_OS_IOS    - iOS
-//       GTEST_OS_IOS_SIMULATOR - iOS simulator
 //   GTEST_OS_NACL     - Google Native Client (NaCl)
 //   GTEST_OS_OPENBSD  - OpenBSD
 //   GTEST_OS_QNX      - QNX
@@ -322,9 +321,6 @@
 # define GTEST_OS_MAC 1
 # if TARGET_OS_IPHONE
 #  define GTEST_OS_IOS 1
-#  if TARGET_IPHONE_SIMULATOR
-#   define GTEST_OS_IOS_SIMULATOR 1
-#  endif
 # endif
 #elif defined __linux__
 # define GTEST_OS_LINUX 1
@@ -810,7 +806,7 @@
 // abort() in a VC 7.1 application compiled as GUI in debug config
 // pops up a dialog window that cannot be suppressed programmatically.
 #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_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
      GTEST_OS_OPENBSD || GTEST_OS_QNX)