From fa57e3878524cbc85080ce4beed4b4ae6b15a7c8 Mon Sep 17 00:00:00 2001
From: parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Thu, 28 Aug 2003 23:17:42 +0000
Subject: ChangeLogTag: Thu Aug 28 18:10:33 2003  Jeff Parsons
 <j.parsons@vanderbilt.edu>

---
 TAO/ChangeLog                                | 12 ++++++++++++
 TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp |  1 +
 TAO/tao/Utils/RIR_Narrow.cpp                 |  7 +++----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b8999da017d..c2c95c2baad 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Thu Aug 28 18:10:33 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+
+          Added #include of tao/CDR.h to fully define TAO_InputCDR.
+
+        * tao/Utils/RIR_Narrow.cpp:
+
+          Added explicit 'typename' to return type of each class
+          method, since they are typedefs inside template classes,
+          and gcc 3.3.1 is no longer tolerant of implicit typenames.
+
 Thu Aug 28 22:24:51 UTC 2003  Scott Harris <harris_s@ociweb.com>
 
 	* tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index 1ef3f6df0f6..d8a76ce6170 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -7,6 +7,7 @@
 #include "tao/Any.h"
 #include "tao/Managed_Types.h"
 #include "tao/Environment.h"
+#include "tao/CDR.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "ETCL_Constraint.inl"
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 27e35d4e7d4..057ba51c9c8 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -8,11 +8,10 @@ ACE_RCSID (Utils,
            RIR_Narror,
            "$Id$")
 
-template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type
+template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb,
                                    char const * id
                                    ACE_ENV_ARG_DECL)
-
 {
   CORBA::Object_var object =
     orb->resolve_initial_references (id
@@ -23,7 +22,7 @@ TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb,
                                        ACE_ENV_ARG_PARAMETER);
 }
 
-template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type
+template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info,
                                    char const * id
                                    ACE_ENV_ARG_DECL)
@@ -37,7 +36,7 @@ TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info,
                                        ACE_ENV_ARG_PARAMETER);
 }
 
-template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type
+template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object
                                           ACE_ENV_ARG_DECL)
 {
-- 
cgit v1.2.1