summaryrefslogtreecommitdiff
path: root/ACE/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/tests')
-rw-r--r--ACE/tests/Array_Map_Test.cpp2
-rw-r--r--ACE/tests/Cached_Accept_Conn_Test.cpp9
-rw-r--r--ACE/tests/Proactor_Test.cpp26
-rw-r--r--ACE/tests/Proactor_Test_IPV6.cpp26
-rw-r--r--ACE/tests/Proactor_UDP_Test.cpp26
-rw-r--r--ACE/tests/Unload_libACE.cpp4
6 files changed, 4 insertions, 89 deletions
diff --git a/ACE/tests/Array_Map_Test.cpp b/ACE/tests/Array_Map_Test.cpp
index ad972a8eb43..725814d7f33 100644
--- a/ACE/tests/Array_Map_Test.cpp
+++ b/ACE/tests/Array_Map_Test.cpp
@@ -296,7 +296,7 @@ index_operator_test ()
const_reverse_iterator const rlast = const_phonetic.rend ();
for (const_reverse_iterator r = const_phonetic.rbegin ();
- !(r == rlast); // Sun C++ Forte doesn't support operator!=
+ (r != rlast);
++r, --letter, --word)
{
if ((*r).first != *letter || (*r).second != *word)
diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp
index 5338c38ddc0..71c07ca733c 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.cpp
+++ b/ACE/tests/Cached_Accept_Conn_Test.cpp
@@ -30,16 +30,7 @@
#pragma warning(disable:4503)
#endif /* _MSC_VER */
-// Note: To keep both sunCC5.0 without debugging symbols and gcc2.7.3
-// happy, it was necessary to have the definitions of the methods of
-// the Accept_Strategy before the instantiations.
-
-// For some strange reason this must *not* be static since otherwise
-// certain versions of SunC++ will not link properly.
int connection_accepted = 0;
-
-// For some strange reason this must *not* be static since otherwise
-// certain versions of SunC++ will not link properly.
int debug = 0;
template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp
index e82b054b90c..6657c096a15 100644
--- a/ACE/tests/Proactor_Test.cpp
+++ b/ACE/tests/Proactor_Test.cpp
@@ -50,7 +50,6 @@
# include "ace/POSIX_Proactor.h"
# include "ace/POSIX_CB_Proactor.h"
-# include "ace/SUN_Proactor.h"
#endif /* ACE_WIN32 */
@@ -58,7 +57,7 @@
// Proactor Type (UNIX only, Win32 ignored)
-using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB };
+using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB };
static ProactorType proactor_type = DEFAULT;
// POSIX : > 0 max number aio operations proactor,
@@ -238,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
break;
#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
-# if defined (sun)
- case SUN:
- ACE_NEW_RETURN (proactor_impl,
- ACE_SUN_Proactor (max_op),
- -1);
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("(%t) Create Proactor Type = SUN\n")));
- break;
-# endif /* sun */
-
# if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT)
case CB:
ACE_NEW_RETURN (proactor_impl,
@@ -1722,7 +1711,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[])
ACE_TEXT ("\n a AIOCB")
ACE_TEXT ("\n i SIG")
ACE_TEXT ("\n c CB")
- ACE_TEXT ("\n s SUN")
ACE_TEXT ("\n d default")
ACE_TEXT ("\n-d <duplex mode 1-on/0-off>")
ACE_TEXT ("\n-h <host> for Client mode")
@@ -1761,11 +1749,6 @@ set_proactor_type (const ACE_TCHAR *ptype)
case 'I':
proactor_type = SIG;
return 1;
-#if defined (sun)
- case 'S':
- proactor_type = SUN;
- return 1;
-#endif /* sun */
#if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT)
case 'C':
proactor_type = CB;
@@ -1849,13 +1832,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
} // switch
} // while
- if (proactor_type == SUN && threads > 1)
- {
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ")
- ACE_TEXT ("changing to 1 thread\n")));
- threads = 1;
- }
-
return 0;
}
diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp
index 376e7b415c6..0a4e4e84c18 100644
--- a/ACE/tests/Proactor_Test_IPV6.cpp
+++ b/ACE/tests/Proactor_Test_IPV6.cpp
@@ -51,14 +51,13 @@
# include "ace/POSIX_Proactor.h"
# include "ace/POSIX_CB_Proactor.h"
-# include "ace/SUN_Proactor.h"
#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */
#include "Proactor_Test.h"
// Proactor Type (UNIX only, Win32 ignored)
-using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB };
+using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB };
static ProactorType proactor_type = DEFAULT;
// POSIX : > 0 max number aio operations proactor,
@@ -238,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
break;
#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
-# if defined (sun)
- case SUN:
- ACE_NEW_RETURN (proactor_impl,
- ACE_SUN_Proactor (max_op),
- -1);
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("(%t) Create Proactor Type = SUN\n")));
- break;
-# endif /* sun */
-
# if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT)
case CB:
ACE_NEW_RETURN (proactor_impl,
@@ -1759,7 +1748,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[])
ACE_TEXT ("\n a AIOCB")
ACE_TEXT ("\n i SIG")
ACE_TEXT ("\n c CB")
- ACE_TEXT ("\n s SUN")
ACE_TEXT ("\n d default")
ACE_TEXT ("\n-d <duplex mode 1-on/0-off>")
ACE_TEXT ("\n-h <host> for Client mode")
@@ -1798,11 +1786,6 @@ set_proactor_type (const ACE_TCHAR *ptype)
case 'I':
proactor_type = SIG;
return 1;
-#if defined (sun)
- case 'S':
- proactor_type = SUN;
- return 1;
-#endif /* sun */
#if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT)
case 'C':
proactor_type = CB;
@@ -1890,13 +1873,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
} // switch
} // while
- if (proactor_type == SUN && threads > 1)
- {
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ")
- ACE_TEXT ("changing to 1 thread\n")));
- threads = 1;
- }
-
return 0;
}
diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp
index 6de098e6430..30457b30ac3 100644
--- a/ACE/tests/Proactor_UDP_Test.cpp
+++ b/ACE/tests/Proactor_UDP_Test.cpp
@@ -47,12 +47,11 @@
# include "ace/POSIX_Proactor.h"
# include "ace/POSIX_CB_Proactor.h"
-# include "ace/SUN_Proactor.h"
#endif /* ACE_WIN32 */
// Proactor Type (UNIX only, Win32 ignored)
-using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB };
+using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB };
static ProactorType proactor_type = DEFAULT;
// POSIX : > 0 max number aio operations proactor,
@@ -233,16 +232,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
break;
#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
-# if defined (sun)
- case SUN:
- ACE_NEW_RETURN (proactor_impl,
- ACE_SUN_Proactor (max_op),
- -1);
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("(%t) Create Proactor Type = SUN\n")));
- break;
-# endif /* sun */
-
# if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT)
case CB:
ACE_NEW_RETURN (proactor_impl,
@@ -1988,7 +1977,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[])
ACE_TEXT ("\n a AIOCB")
ACE_TEXT ("\n i SIG")
ACE_TEXT ("\n c CB")
- ACE_TEXT ("\n s SUN")
ACE_TEXT ("\n d default")
ACE_TEXT ("\n-d <duplex mode 1-on/0-off>")
ACE_TEXT ("\n-h <host> for Client mode")
@@ -2027,11 +2015,6 @@ set_proactor_type (const ACE_TCHAR *ptype)
case 'I':
proactor_type = SIG;
return 1;
-#if defined (sun)
- case 'S':
- proactor_type = SUN;
- return 1;
-#endif /* sun */
#if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT)
case 'C':
proactor_type = CB;
@@ -2115,13 +2098,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
} // switch
} // while
- if (proactor_type == SUN && threads > 1)
- {
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ")
- ACE_TEXT ("changing to 1 thread\n")));
- threads = 1;
- }
-
return 0;
}
diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp
index 42270fa0b6d..17088486a32 100644
--- a/ACE/tests/Unload_libACE.cpp
+++ b/ACE/tests/Unload_libACE.cpp
@@ -26,10 +26,6 @@
#endif /* !ACE_VXWORKS && !__MINGW32__ && !CYGWIN32 */
#endif /* __GNUC__ */
-#if defined (__SUNPRO_CC)
-#define UNLOAD_LIBACE_TEST 1
-#endif /* (__SUNPRO_CC) */
-
#if defined (ACE_AS_STATIC_LIBS)
#undef UNLOAD_LIBACE_TEST
#endif /* ACE_AS_STATIC_LIBS */
View Lorry Controller Status