summaryrefslogtreecommitdiff
path: root/TAO/examples
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples')
-rw-r--r--TAO/examples/AMH/Sink_Server/Base_Server.cpp2
-rw-r--r--TAO/examples/AMH/Sink_Server/Client_Task.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/peer.cpp2
-rw-r--r--TAO/examples/OBV/Simple_util.h5
-rw-r--r--TAO/examples/Persistent_Grid/Simple_util.h5
-rw-r--r--TAO/examples/Simple/Simple_util.h5
-rw-r--r--TAO/examples/Simple/grid/Grid_i.cpp2
-rw-r--r--TAO/examples/Simple/grid/Grid_i.h2
-rw-r--r--TAO/examples/Simple/time/Time_Client_i.cpp9
-rw-r--r--TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp2
-rw-r--r--TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp8
11 files changed, 7 insertions, 37 deletions
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index 23511c46da6..c3d71b297f0 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -72,7 +72,7 @@ Base_Server::try_RT_scheduling ()
priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
priority);
- // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+ // Enable FIFO scheduling
if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
priority,
ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index 4025854a4e9..2bce4d98968 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -61,7 +61,7 @@ Client_Task::try_RT_scheduling ()
priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
priority);
- // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+ // Enable FIFO scheduling
if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
priority,
ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index c4dcc225ef7..ac19e3863ce 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
priority);
- // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+ // Enable FIFO scheduling
if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
priority,
ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 30b9d2fe8ee..32bfe42a5ae 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -149,11 +149,6 @@ protected:
int shutdown_;
};
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Simple_util.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#endif /* TAO_UTIL_H */
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index d9272e1fe0c..acb0aa284db 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -144,11 +144,6 @@ protected:
Var server_;
};
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Simple_util.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#endif /* TAO_UTIL_H */
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 51319b172f1..d78ad81de95 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -160,11 +160,6 @@ private:
int do_shutdown_;
};
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Simple_util.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#endif /* TAO_UTIL_H */
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 3fa4a1fcd6c..6906f8585d7 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -1,7 +1,7 @@
// -*- C++ -*-
#include "Grid_i.h"
-// Solaris and some Windows compilers don't have min in std namespaces
+// Some Windows compilers don't have min in std namespaces
// moreover on Windows 'min' is a macro, so we have to avoid using it literally.
CORBA::UShort
Grid_i::ushort_min (CORBA::UShort a, CORBA::UShort b)
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index 6d85fddce5d..fcce738f501 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -74,7 +74,7 @@ private:
typedef ACE_Auto_Array_Ptr<CORBA::Long> GridArray;
GridArray array_;
- /// Solaris and some Windows compilers don't have min in std namespaces
+ /// Some Windows compilers don't have min in std namespaces
static CORBA::UShort ushort_min (CORBA::UShort, CORBA::UShort);
};
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index 2ffb6c48a35..87feb97e099 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -27,13 +27,8 @@ Time_Client_i::run (const char *name,
try
{
// 64-bit OS's require pointers to be aligned on an
- // 8 byte boundary. 64-bit HP-UX requires a double to do this
- // while a long does it for 64-bit Solaris.
-#if defined (HPUX)
- CORBA::Double padding = 0.0;
-#else
+ // 8 byte boundary.
CORBA::Long padding = 0;
-#endif /* HPUX */
time_t timedate;
ACE_UNUSED_ARG (padding);
@@ -42,8 +37,6 @@ Time_Client_i::run (const char *name,
timedate = static_cast <time_t> (client_->current_time ());
// Print out value
- // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly
- // under 64-bit solaris.
ACE_TCHAR ascii_timedate[64] = ACE_TEXT ("");
ACE_OS::ctime_r (&timedate, ascii_timedate, 64);
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index 5eaee1f34e9..73eea3a075b 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -1004,7 +1004,7 @@ DualEC_Supplier::get_options (int argc, ACE_TCHAR *argv [])
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
- // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+ // Enable FIFO scheduling
int min_priority =
ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 9cda0d5e84f..19c3243803f 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -28,14 +28,6 @@
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_ctype.h"
-#if defined (ACE_OPENVMS)
-// need this to circumvent link error on OpenVMS
-// has to do with interference in template instantiations
-// for the server build by previous compilation of
-// components which are reused here without recompilation
-ACE_Time_Value dum = ACE_Time_Value::zero;
-#endif
-
static const char usage [] =
"[[-?]\n"
" [-O[RBport] ORB port number]\n"
View Lorry Controller Status