ChangeLogTag: Fri Apr 21 07:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 16 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 3344803e3b0..717140d1080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 21 07:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Caching_Utility_T.cpp:
+          Removed invalid added const
+
 Thu Apr 20 19:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/os_include/sys/os_types.h:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index c4c81385ac1..911fc6abf7d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -14,9 +14,9 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy ()
 FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy (
     const FP_Segment_Sched_Param_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-  ACE_NESTED_CLASS (CORBA, Policy) (),
-  ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+  CORBA::Policy (),
+  CORBA::LocalObject (),
   FP_Scheduling::SegmentSchedulingParameterPolicy (),
   TAO_Local_RefCounted_Object (),
   value_ (rhs.value_)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index 3bb789fd3da..43dac21d14a 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -14,9 +14,9 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy ()
 MIF_Sched_Param_Policy::MIF_Sched_Param_Policy (
     const MIF_Sched_Param_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-  ACE_NESTED_CLASS (CORBA, Policy) (),
-  ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+  CORBA::Policy (),
+  CORBA::LocalObject (),
   MIF_Scheduling::SchedulingParameterPolicy (),
   TAO_Local_RefCounted_Object (),
   value_ (rhs.value_)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 2ee40930b0e..dec4a6e5211 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -14,9 +14,9 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy ()
 MUF_Sched_Param_Policy::MUF_Sched_Param_Policy (
     const MUF_Sched_Param_Policy &rhs
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (),
-  ACE_NESTED_CLASS (CORBA, Policy) (),
-  ACE_NESTED_CLASS (CORBA, LocalObject) (),
+  : CORBA::Object (),
+  CORBA::Policy (),
+  CORBA::LocalObject (),
   MUF_Scheduling::SchedulingParameterPolicy (),
   TAO_Local_RefCounted_Object (),
   value_ (rhs.value_)
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
index 1a121915c62..cfc1c88914b 100644
--- a/protocols/ace/RMCast/Makefile.am
+++ b/protocols/ace/RMCast/Makefile.am
@@ -35,8 +35,7 @@ libACE_RMCast_la_SOURCES = \
   Retransmit.cpp \
   Simulator.cpp \
   Socket.cpp \
-  Stack.cpp \
-  Template_Instantiations.cpp
+  Stack.cpp
 
 libACE_RMCast_la_LDFLAGS = \
  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
diff --git a/protocols/ace/TMCast/Makefile.am b/protocols/ace/TMCast/Makefile.am
index 3338e4a8f64..3a1f1e54ea9 100644
--- a/protocols/ace/TMCast/Makefile.am
+++ b/protocols/ace/TMCast/Makefile.am
@@ -25,8 +25,7 @@ libACE_TMCast_la_CPPFLAGS = \
 libACE_TMCast_la_SOURCES = \
   Group.cpp \
   MTQueue.cpp \
-  Protocol.cpp \
-  Template_Instantiations.cpp
+  Protocol.cpp
 
 libACE_TMCast_la_LDFLAGS = \
  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@