4 files changed, 3 insertions, 15 deletions
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);