6 files changed, 1 insertions, 26 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index a7b0e2bf5f0..50fa3272b9f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -26,11 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //////////////////////
 
 // compare the DFS finish times of two task entries, order higher time *first*
-#if defined (ACE_HAS_WINCE)
-int _cdecl compare_entry_finish_times (const void *first, const void *second)
-#else
 extern "C" int compare_entry_finish_times (const void *first, const void *second)
-#endif  // ACE_HAS_WINCE
 {
   // sort blank entries to the end
   if (! first)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index 915645bdb6b..f1ae68873a7 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -489,13 +489,7 @@ protected:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reconfig_Sched_Utils_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* TAO_RECONFIG_SCHED_UTILS_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index 3a8d9fbe6a9..cf97c6a068a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -597,14 +597,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "orbsvcs/Sched/Reconfig_Scheduler_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reconfig_Scheduler_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
 
 #include /**/ "ace/post.h"
 #endif /* TAO_RECONFIG_SCHEDULER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
index b007c81109e..cf5cbd75de7 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -93,7 +93,7 @@ private:
 
   /**
    * Set to 1 if priority values increase with increasing priority,
-   * such as on Solaris and Win32, or 0 if they decrease, such as on
+   * such as on Win32, or 0 if they decrease, such as on
    * VxWorks.
    */
   int increasing_priority_;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 74e5d01c316..9421340692f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -15,15 +15,11 @@
 // Helper function type definition for sort //
 //////////////////////////////////////////////
 
-#if defined (ACE_HAS_WINCE)
-typedef int (_cdecl* COMP_FUNC) (const void*, const void*);
-#else
 // This is awkward, but it makes MSVC++ happy.
 extern "C"
 {
 typedef int (*COMP_FUNC) (const void*, const void*);
 }
-#endif  // ACE_HAS_WINCE
 
 ///////////////////////////////////////////////////
 // class ACE_Strategy_Scheduler member functions //
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index 9f25a876c4a..fcdd9eaa8ed 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -244,11 +244,7 @@ protected:
 
 private:
     // = Comparison function to pass to qsort: calls instance ()->sort_comp ().
-#if defined (ACE_HAS_WINCE)
-  static int _cdecl sort_function (void *arg1, void *arg2);
-#else
   static int sort_function (void *arg1, void *arg2);
-#endif  // ACE_HAS_WINCE
 
     /// Instance of the strategy.
   static ACE_MUF_Scheduler_Strategy *instance_;