Fri Jan 26 10:03:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 35 insertions, 26 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 4a2943cbbb3..ea99b8a1329 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,10 +1,19 @@
+Fri Jan 26 10:03:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Cached_Connect_Strategy_T.cpp
+        * ace/Event_Handler_T.inl
+        * ace/Future.cpp
+        * ace/Future_Set.cpp
+        * examples/C++NPv2/Reactor_Logging_Server_T.cpp
+          Use typename
+
 Thu Jan 25 19:59:23 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/templates/gnu.mpd:
 
-            The include of rules.cia.GNU must come before the include of
-            rules.tao.GNU in order for CIAO libraries to have the correct
-            version numbers.
+          The include of rules.cia.GNU must come before the include of
+          rules.tao.GNU in order for CIAO libraries to have the correct
+          version numbers.
 
         * bin/auto_run_tests.pl:
 
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index 706142c640d..f9c1cb6a3a2 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -529,7 +529,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup (void)
   ACE_GUARD (MUTEX, ace_mon, *this->lock_);
 
   // Close down all cached service handlers.
-  ACE_TYPENAME CONNECTION_CACHE::ITERATOR iter =
+  typename CONNECTION_CACHE::ITERATOR iter =
     this->connection_cache_.begin ();
   while (iter != this->connection_cache_.end ())
     {
@@ -544,7 +544,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup (void)
           (*iter).second ()->close ();
 
           // remember next iter
-          ACE_TYPENAME CONNECTION_CACHE::ITERATOR next_iter = iter;
+          typename CONNECTION_CACHE::ITERATOR next_iter = iter;
           ++next_iter;
 
           // purge the item from the hash
diff --git a/ACE/ace/Event_Handler_T.inl b/ACE/ace/Event_Handler_T.inl
index 5d2e31ab81e..c3facd7e25f 100644
--- a/ACE/ace/Event_Handler_T.inl
+++ b/ACE/ace/Event_Handler_T.inl
@@ -20,7 +20,7 @@ ACE_Event_Handler_T<T>::op_handler (void)
   return this->op_handler_;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::GET_HANDLE
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::GET_HANDLE
 ACE_Event_Handler_T<T>::handle_get (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_get");
@@ -28,13 +28,13 @@ ACE_Event_Handler_T<T>::handle_get (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::handle_get (ACE_TYPENAME ACE_Event_Handler_T<T>::GET_HANDLE h)
+ACE_Event_Handler_T<T>::handle_get (typename ACE_Event_Handler_T<T>::GET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_get");
   this->get_handle_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::SET_HANDLE
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::SET_HANDLE
 ACE_Event_Handler_T<T>::handle_set (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_set");
@@ -42,13 +42,13 @@ ACE_Event_Handler_T<T>::handle_set (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::handle_set (ACE_TYPENAME ACE_Event_Handler_T<T>::SET_HANDLE h)
+ACE_Event_Handler_T<T>::handle_set (typename ACE_Event_Handler_T<T>::SET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_set");
   this->set_handle_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::IO_HANDLER
 ACE_Event_Handler_T<T>::input_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::input_handler");
@@ -56,13 +56,13 @@ ACE_Event_Handler_T<T>::input_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::input_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::input_handler (typename ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::input_handler");
   this->input_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::IO_HANDLER
 ACE_Event_Handler_T<T>::output_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::output_handler");
@@ -70,13 +70,13 @@ ACE_Event_Handler_T<T>::output_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::output_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::output_handler (typename ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::output_handler");
   this->output_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::IO_HANDLER
 ACE_Event_Handler_T<T>::except_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::except_handler");
@@ -84,13 +84,13 @@ ACE_Event_Handler_T<T>::except_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::except_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::except_handler (typename ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::except_handler");
   this->except_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::TO_HANDLER
 ACE_Event_Handler_T<T>::to_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::to_handler");
@@ -98,13 +98,13 @@ ACE_Event_Handler_T<T>::to_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::to_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER h)
+ACE_Event_Handler_T<T>::to_handler (typename ACE_Event_Handler_T<T>::TO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::to_handler");
   this->to_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::CL_HANDLER
 ACE_Event_Handler_T<T>::cl_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::cl_handler");
@@ -112,13 +112,13 @@ ACE_Event_Handler_T<T>::cl_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::cl_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER h)
+ACE_Event_Handler_T<T>::cl_handler (typename ACE_Event_Handler_T<T>::CL_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::cl_handler");
   this->cl_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::SIG_HANDLER
 ACE_Event_Handler_T<T>::sig_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler");
@@ -126,7 +126,7 @@ ACE_Event_Handler_T<T>::sig_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::sig_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER h)
+ACE_Event_Handler_T<T>::sig_handler (typename ACE_Event_Handler_T<T>::SIG_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler");
   this->sig_handler_ = h;
diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp
index 3ca6f8225ba..ae8bdeed457 100644
--- a/ACE/ace/Future.cpp
+++ b/ACE/ace/Future.cpp
@@ -183,10 +183,10 @@ ACE_Future_Rep<T>::set (const T &r,
                           -1);
 
           // Remove and notify all subscribed observers.
-          ACE_TYPENAME OBSERVER_COLLECTION::iterator iterator =
+          typename OBSERVER_COLLECTION::iterator iterator =
             this->observer_collection_.begin ();
 
-          ACE_TYPENAME OBSERVER_COLLECTION::iterator end =
+          typename OBSERVER_COLLECTION::iterator end =
             this->observer_collection_.end ();
 
           while (iterator != end)
diff --git a/ACE/ace/Future_Set.cpp b/ACE/ace/Future_Set.cpp
index d9b9e2a1ac9..a87770d5528 100644
--- a/ACE/ace/Future_Set.cpp
+++ b/ACE/ace/Future_Set.cpp
@@ -31,10 +31,10 @@ template <class T>
 ACE_Future_Set<T>::~ACE_Future_Set (void)
 {
   // Detach ourselves from all remaining futures, if any, in our map.
-  ACE_TYPENAME FUTURE_HASH_MAP::iterator iterator =
+  typename FUTURE_HASH_MAP::iterator iterator =
     this->future_map_.begin ();
 
-  ACE_TYPENAME FUTURE_HASH_MAP::iterator end =
+  typename FUTURE_HASH_MAP::iterator end =
     this->future_map_.end ();
 
   for (;
diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.cpp b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.cpp
index 3e25be39373..45929b722df 100644
--- a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.cpp
+++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.cpp
@@ -11,7 +11,7 @@ Reactor_Logging_Server<ACCEPTOR>::Reactor_Logging_Server
   (int argc, char *argv[], ACE_Reactor *reactor)
   : ACCEPTOR (reactor) {
   u_short logger_port = argc > 0 ? atoi (argv[0]) : 0;
-  ACE_TYPENAME ACCEPTOR::PEER_ADDR server_addr;
+  typename ACCEPTOR::PEER_ADDR server_addr;
   int result;
 
   if (logger_port != 0)