ChangeLogTag:Mon Jul 7 21:38:01 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

7 files changed, 32 insertions, 10 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 821662a1886..d5883e3e901 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,22 @@
+Mon Jul  7 21:38:01 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/Any.h:
+	* tao/Any.cpp: Cosmetic fix. Changed char*& in the >>= operator to
+	  CORBA::Char *&.
+
+	* tao/Basic_Arguments.h: Added a public keyword in the class
+	  Arg_Traits<void>. Classes by default have all the members
+	  private unlike structs which are the other way around.
+
+	* tao/Synch_Invocation.h: Fixed typos.
+
+	* tao/UB_String_Argument_T.h: Fixed a typo in the doxygen
+	  comments. 
+	
+	* tao/UB_String_Argument_T.cpp (interceptor_replace): Fixed a
+	  bunch of compile errors with g++ 3.3 which required a explicit
+	  const qualifier to pick up the right extraction operator. 
+
 Mon Jul  7 17:53:06 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_argument.cpp:
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 2ee8f2849f0..3fea9dcb6ff 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -1099,7 +1099,7 @@ operator>>= (const CORBA::Any &any, const CORBA::Any *&a)
 }
 
 CORBA::Boolean
-operator>>= (const CORBA::Any &any, const char *&s)
+operator>>= (const CORBA::Any &any, const CORBA::Char *&s)
 {
   return TAO::Any_Impl_T<char>::extract (
       any,
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 6f70d0e3658..13dfa2f0218 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -402,7 +402,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
                                        CORBA::TypeCode_ptr &);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const char *&);
+                                       const CORBA::Char *&);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
                                        const CORBA::WChar *&);
 
diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h
index 9a71ab9f0d2..e9703484b48 100644
--- a/TAO/tao/Basic_Arguments.h
+++ b/TAO/tao/Basic_Arguments.h
@@ -33,6 +33,7 @@ namespace TAO
   template<>
   class TAO_Export Arg_Traits<void>
   {
+    public:
     typedef void        ret_type;
 
     typedef Argument    stub_ret_val;
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index 9af28c380e7..dda83210913 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -22,7 +22,7 @@
 
 #include "tao/Remote_Invocation.h"
 
-class TAO_Operation_Deatils;
+class TAO_Operation_Details;
 class TAO_Synch_Reply_Dispatcher;
 
 namespace TAO
@@ -60,4 +60,6 @@ namespace TAO
   };
 }
 
+
+#include "ace/post.h"
 #endif /*TAO_SYNCH_INVOCATION_H*/
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index 2afb19d3f19..3d6d83a3006 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -70,7 +70,7 @@ template<typename S>
 CORBA::Boolean
 TAO::Inout_UB_String_Argument_T<S>::interceptor_replace (CORBA::Any & any)
 {
-  return any >>= this->x_;
+  return any >>= (const S*) this->x_;
 }
 
 // ==============================================================
@@ -112,7 +112,7 @@ template<typename S, typename S_var>
 CORBA::Boolean
 TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_replace (CORBA::Any & any)
 {
-  return any >>= this->x_;
+  return any >>= (const S *)this->x_.inout ();
 }
 
 template<typename S, typename S_var>
@@ -156,7 +156,7 @@ template<typename S, typename S_var>
 CORBA::Boolean
 TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_replace (CORBA::Any & any)
 {
-  return any >>= this->x_.out ();
+  return any >>= (const S*) this->x_.out ();
 }
 
 template<typename S, typename S_var>
@@ -202,7 +202,7 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_replace (
     CORBA::Any & any
   )
 {
-  return any >>= this->x_.out ();
+  return any >>= (const S *)this->x_.out ();
 }
 
 template<typename S, typename S_var>
@@ -261,7 +261,7 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_replace (
     CORBA::Any & any
   )
 {
-  return any >>= this->x_.out ();
+  return any >>= (const S*) this->x_.out ();
 }
 
 template<typename S, typename S_var>
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 3ff6f54fece..c2491915e49 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -63,7 +63,7 @@ namespace TAO
     virtual CORBA::Boolean interceptor_replace (CORBA::Any &);
 
   private:
-    mutable S *& x_;
+    S *& x_;
   };
 
   /**
@@ -207,7 +207,7 @@ namespace TAO
   struct TAO_Export UB_String_Tag {};
 
   /**
-   * @struct Basic_Arg_Traits_T
+   * @struct UB_String_Arg_Traits_T
    *
    * @brief Template class for argument traits of unbounded (w)strings.
    *