diff options
Diffstat (limited to 'ACE/examples')
33 files changed, 10 insertions, 230 deletions
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h index 17ae8c06a62..f24577307da 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h @@ -112,13 +112,7 @@ private: #define ACE_INLINE #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Peer_Router.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Peer_Router.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ #endif /* _PEER_ROUTER_H */ diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h index 931ec9ea65c..56dc447e693 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h @@ -160,12 +160,6 @@ private: int logging_level_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "BPR_Drivers_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BPR_Drivers_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _BPR_DRIVERS_T_H_ */ diff --git a/ACE/examples/C++NPv1/README b/ACE/examples/C++NPv1/README index 25126be99b1..52c29053541 100644 --- a/ACE/examples/C++NPv1/README +++ b/ACE/examples/C++NPv1/README @@ -7,7 +7,6 @@ Patterns'' (C++NPv1) by Douglas C. Schmidt and Stephen D. Huston We have compiled and run these files on the following platforms: - Sun Solaris 8 on SPARC using Sun Forte 6. Redhat Linux 7.1 using g++ 2.96. Microsoft Windows 2000 using Microsoft Visual C++ 6. diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp index 3122d0a87da..054aa03f0d2 100644 --- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp +++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp @@ -4,7 +4,7 @@ #include "ace/config-all.h" -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) +#if defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)) #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_socket.h" @@ -351,7 +351,7 @@ int AIO_Client_Logging_Daemon::fini () { return 0; } -#endif /* (ACE_WIN32 && !ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ ACE_FACTORY_DEFINE (AIO_CLD, AIO_Client_Logging_Daemon) diff --git a/ACE/examples/C++NPv2/README b/ACE/examples/C++NPv2/README index e741eb64ed8..b9fa446c91b 100644 --- a/ACE/examples/C++NPv2/README +++ b/ACE/examples/C++NPv2/README @@ -7,7 +7,6 @@ The files in this directory contain the source code from the book We have compiled and run these files on the following platforms: - Sun Solaris 8 on SPARC using Sun Forte 6. Redhat Linux 7.1 using g++ 2.96. Microsoft Windows 2000 using Microsoft Visual C++ 6. diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h index b4839beb648..f3b1a3b7846 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h @@ -22,12 +22,6 @@ private: Reactor_Logging_Server<ACCEPTOR> *server_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reactor_Logging_Server_Adapter.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reactor_Logging_Server_Adapter.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _REACTOR_LOGGING_SERVER_ADAPTER_H */ diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h index 2df69c8bb04..e21a745ec05 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h @@ -16,12 +16,6 @@ public: ACE_Reactor *reactor); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reactor_Logging_Server_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reactor_Logging_Server_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _REACTOR_LOGGING_SERVER_T_H */ diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.h b/ACE/examples/Connection/non_blocking/CPP-acceptor.h index e01d505a8ec..7a2eb1a3b00 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h @@ -80,12 +80,6 @@ private: // signal. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "CPP-acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("CPP-acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CPP_ACCEPTOR_H */ diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.h b/ACE/examples/Connection/non_blocking/CPP-connector.h index 8bc322a058d..2f89038ce25 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.h +++ b/ACE/examples/Connection/non_blocking/CPP-connector.h @@ -84,12 +84,6 @@ private: // signal. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "CPP-connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("CPP-connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CPP_CONNECTOR_H */ diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc index b8fc1278152..56eedf33423 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc +++ b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc @@ -7,7 +7,6 @@ project(*C_inclient) : aceexe { } project(*C_inserver) : aceexe { - avoids += wince exename = C-inserver Source_Files { C-inserver.cpp diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc index 43b42f64429..ba8c411b325 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- project : aceexe, ace_mfc { - avoids += wince exename = Log_Msg_MFC - Source_Files { + Source_Files { Log_Msg_MFC.cpp Log_Msg_MFCDlg.cpp MFC_Log.cpp diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp index c05addf6cc7..1e476e4bb89 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp @@ -103,7 +103,6 @@ BOOL CLog_Msg_MFCDlg::OnInitDialog() ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); ASSERT(IDM_ABOUTBOX < 0xF000); -#if !defined (_WIN32_WCE) CMenu* pSysMenu = GetSystemMenu(FALSE); if (pSysMenu != 0) { @@ -115,7 +114,6 @@ BOOL CLog_Msg_MFCDlg::OnInitDialog() pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); } } -#endif /* !_WIN32_WCE */ // Set the icon for this dialog. The framework does this automatically // when the application's main window is not a dialog diff --git a/ACE/examples/NT_Service/NT_Service.mpc b/ACE/examples/NT_Service/NT_Service.mpc index 76522621847..756d0562548 100644 --- a/ACE/examples/NT_Service/NT_Service.mpc +++ b/ACE/examples/NT_Service/NT_Service.mpc @@ -1,5 +1,4 @@ // -*- MPC -*- project : aceexe, winregistry { - avoids += wince exename = main } diff --git a/ACE/examples/OS/Process/OS_Process.mpc b/ACE/examples/OS/Process/OS_Process.mpc index a6cffe93337..3b23928c3ad 100644 --- a/ACE/examples/OS/Process/OS_Process.mpc +++ b/ACE/examples/OS/Process/OS_Process.mpc @@ -6,7 +6,6 @@ project(*imore) : aceexe, avoids_ace_for_tao { } } project(*process) : aceexe { - avoids += wince exename = process Source_Files { process.cpp diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/README b/ACE/examples/QOS/Change_Receiver_FlowSpec/README index 7fab042dd19..5f1c66344dc 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/README +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. In addition it dynamically changes the receiver flow spec which in turn changes the RESV messages sent. diff --git a/ACE/examples/QOS/Change_Sender_TSpec/README b/ACE/examples/QOS/Change_Sender_TSpec/README index 6b24dcc704b..34238f4fec4 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/README +++ b/ACE/examples/QOS/Change_Sender_TSpec/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. In addition it dynamically changes the sender TSpec which in turn changes the PATH messages. diff --git a/ACE/examples/QOS/Diffserv/NOTES.txt b/ACE/examples/QOS/Diffserv/NOTES.txt index 6009e2fed59..4f88b9e1762 100644 --- a/ACE/examples/QOS/Diffserv/NOTES.txt +++ b/ACE/examples/QOS/Diffserv/NOTES.txt @@ -49,9 +49,3 @@ However, FreeBSD seems to be more fussy about the size of the parameter you pass into the setsockopt call. Make sure you get the size right, and cast it properly, ie. don't cast a short, or some other size. - - -Solaris notes -============= -No problems setting DSCP or ECN values. - diff --git a/ACE/examples/QOS/Simple/README b/ACE/examples/QOS/Simple/README index 39aa2fa3abd..5744f0c8099 100644 --- a/ACE/examples/QOS/Simple/README +++ b/ACE/examples/QOS/Simple/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. ------------------------------------------------------------------------ diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp index 3ee661d9b30..8dfb8259e16 100644 --- a/ACE/examples/Reactor/Proactor/test_cancel.cpp +++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp @@ -13,10 +13,7 @@ * cancel the operation and so the program exits closing the * connection. * - * Works fine on NT. On Solaris platforms, the asynch read is - * pending, but the cancel returns with the value <AIO_ALLDONE> - * indicating all the operations in that handle are done. - * But, LynxOS has a good <aio_cancel> implementation. It works + * Works fine on NT. LynxOS has a good <aio_cancel> implementation. It works * fine. * * = RUN diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index 369d3699737..68542f46080 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp @@ -44,7 +44,6 @@ #elif defined (ACE_HAS_AIO_CALLS) #include "ace/POSIX_Proactor.h" -#include "ace/SUN_Proactor.h" #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ @@ -128,12 +127,6 @@ MyTask::create_proactor () proactor = new ACE_POSIX_SIG_Proactor; ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SIG\n")); break; -# if defined (sun) - case 3: - proactor = new ACE_SUN_Proactor (max_aio_operations); - ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SUN\n")); - break; -# endif /* sun */ default: proactor = new ACE_POSIX_SIG_Proactor; ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SIG\n")); @@ -671,9 +664,6 @@ set_proactor_type (const char *ptype) case 'D' : proactor_type = 0; return true; case 'A' : proactor_type = 1; return true; case 'I' : proactor_type = 2; return true; -#if defined (sun) - case 'S' : proactor_type = 3; return true; -#endif /* sun */ } return false; } @@ -737,9 +727,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { -#if defined (sun) - ACE_DEBUG ((LM_DEBUG, "\nSUN defined!\n")); -#endif if (parse_args (argc, argv) == -1) return -1; diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index 49775b0ef68..00d21aa59c5 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -12,7 +12,7 @@ #include "ace/OS_main.h" -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400 +#if defined (ACE_WIN32) && _WIN32_WINNT >= 0x400 #include "ace/Reactor.h" #include "ace/Auto_Event.h" diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index 78035c00323..9a2a4840559 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp @@ -209,7 +209,7 @@ create_reactor () if (opt_wfmo_reactor) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp index 9bd499624d4..249ee30fa74 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp @@ -1,29 +1,5 @@ #include "Handle_Broadcast.h" -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_Broadcast_C_init_(); - void __std__Handle_Broadcast_C_init_(); -} - -int -init () -{ - __sti__Handle_Broadcast_C_init_(); - return 0; -} - -int -fini () -{ - __std__Handle_Broadcast_C_init_(); - return 0; -} -#endif /* SunOS4 */ - unsigned short Handle_Broadcast::DEFAULT_PORT = ACE_DEFAULT_BROADCAST_PORT; #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp index 7eff9d9db0c..cdf7eb650c0 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp @@ -1,30 +1,5 @@ #include "Handle_L_FIFO.h" - -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_L_FIFO_C_init_(); - void __std__Handle_L_FIFO_C_init_(); -} - -int -init () -{ - __sti__Handle_L_FIFO_C_init_(); - return 0; -} - -int -fini () -{ - __std__Handle_L_FIFO_C_init_(); - return 0; -} -#endif /* SunOS4 */ - const ACE_TCHAR *Handle_L_FIFO::DEFAULT_RENDEZVOUS = ACE_TEXT("/tmp/foo_fifo"); #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp index a21a39e6fe1..89c0e227e5a 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp @@ -1,29 +1,5 @@ #include "Handle_R_Dgram.h" -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_R_Dgram_C_init_(); - void __std__Handle_R_Dgram_C_init_(); -} - -int -init () -{ - __sti__Handle_R_Dgram_C_init_(); - return 0; -} - -int -fini () -{ - __std__Handle_R_Dgram_C_init_(); - return 0; -} -#endif /* SunOS4 */ - unsigned short Handle_R_Dgram::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT; #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp index 8ce2a3214a2..240cb2980ae 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp @@ -1,31 +1,6 @@ #include "Handle_R_Stream.h" -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_R_Stream_C_recv_n_(); - void __std__Handle_R_Stream_C_recv_n_(); -} - -int -init () -{ - __sti__Handle_R_Stream_C_recv_n_(); - return 0; -} - -int -fini () -{ - __std__Handle_R_Stream_C_recv_n_(); - return 0; -} -#endif /* SunOS4 */ - // Static variables. - u_short Handle_R_Stream::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT; char *Handle_R_Stream::login_name = 0; char Handle_R_Stream::login[ACE_MAX_USERID]; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h index 13e5b419445..76c78c9b8ce 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h @@ -63,8 +63,6 @@ protected: extern ACE_Service_Object_Type rts; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Handle_Thr_Stream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_THREADS */ #endif /* _HANDLE_THR_STREAM_H */ diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp index 445dc1c05dd..b605faab14f 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp @@ -1,29 +1,5 @@ #include "Handle_Timeout.h" -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_Timeout_C_init_(); - void __std__Handle_Timeout_C_init_(); -} - -int -init () -{ - __sti__Handle_Timeout_C_init_(); - return 0; -} - -int -fini () -{ - __std__Handle_Timeout_C_init_(); - return 0; -} -#endif /* SunOS4 */ - #if !defined (__ACE_INLINE__) #include "Handle_Timeout.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/examples/Service_Configurator/Misc/README b/ACE/examples/Service_Configurator/Misc/README index d9a9568fbd4..d02bf5fed62 100644 --- a/ACE/examples/Service_Configurator/Misc/README +++ b/ACE/examples/Service_Configurator/Misc/README @@ -1,25 +1,6 @@ - - This directory contains an example that illustrates how the ACE Service Configurator can configure static and dynamic services, both from the command-line and from a svc.config file. We define several instances, i.e., Timer_Service_1 and Timer_Service_2 of the SAME service just to exercise different configuration options. A "real" application would usually define different services. - -Windows CE: ------------ - -When using Windows CE (WCE) emulator, make sure that you use the -following command to copy the svc.conf files into the top-level -directory in CE emulator. - - empfile -c svc.conf1 wce:\svc.conf1 - empfile -c svc.conf2 wce:\svc.conf2 - -The command "empfile" moves the files to emulator's root directory and -resigters the files with CE emulator's object store. - -Also make sure you type in at least one argument (which is argv[0],) -when the program dialog box requests you to key in the program -arguments. Otherwise, the program won't run at all. diff --git a/ACE/examples/Shared_Malloc/test_position_independent_malloc.h b/ACE/examples/Shared_Malloc/test_position_independent_malloc.h index d01985ce0da..97da10749c1 100644 --- a/ACE/examples/Shared_Malloc/test_position_independent_malloc.h +++ b/ACE/examples/Shared_Malloc/test_position_independent_malloc.h @@ -1,6 +1,5 @@ // -// Define struct used in test_position_independent_malloc.cpp - needs -// to be in a separate file for template generation on AIX IBM C++. +// Define struct used in test_position_independent_malloc.cpp #ifndef __TEST_POSITION_INDEPENDENT_MALLOC_H #define __TEST_POSITION_INDEPENDENT_MALLOC_H diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp index 74ab7782476..201aee8885e 100644 --- a/ACE/examples/Threads/tss1.cpp +++ b/ACE/examples/Threads/tss1.cpp @@ -24,7 +24,6 @@ #include "thread_specific.h" -// (Sun C++ 4.2 with -O3 won't link if the following is not const.) static const int iterations = 100; // Static variables. @@ -32,7 +31,6 @@ ACE_MT (ACE_Thread_Mutex Errno::lock_); int Errno::flags_; // This is our thread-specific error handler... -// (Sun C++ 4.2 with -O3 won't link if the following is static.) ACE_TSS<Errno> TSS_Error; // Keeps track of whether Tester::close () has started. diff --git a/ACE/examples/Timer_Queue/Driver.h b/ACE/examples/Timer_Queue/Driver.h index d19f4015e73..ac9d6a98c49 100644 --- a/ACE/examples/Timer_Queue/Driver.h +++ b/ACE/examples/Timer_Queue/Driver.h @@ -128,12 +128,6 @@ protected: Command<RECEIVER, ACTION> *shutdown_cmd_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Driver.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Driver.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _DRIVER_H_ */ diff --git a/ACE/examples/Web_Crawler/main.cpp b/ACE/examples/Web_Crawler/main.cpp index 7a2091ee52d..832548aba8a 100644 --- a/ACE/examples/Web_Crawler/main.cpp +++ b/ACE/examples/Web_Crawler/main.cpp @@ -27,9 +27,7 @@ void sig_handler (int) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { -#if !defined (ACE_HAS_WINCE) ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGFPE); -#endif Web_Crawler crawler; if (crawler.open (argc, argv) == -1) |