Thu Aug 19 10:11:41 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * docs/idltocpp0x/IDLC++0xRFP.odt:
          Updated draft

        * tao/LocalObject.h:
        * tao/LocalObject.inl:
          Removed TAO_Local_Refcounted_Object, it is deprecated for years now

        * tao/Objref_VarOut_T.h:
          Doxygen changes

5 files changed, 20 insertions, 52 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8942f724d6e..79b4ea309c7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,19 +1,31 @@
+Thu Aug 19 10:11:41 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/idltocpp0x/IDLC++0xRFP.odt:
+          Updated draft
+
+        * tao/LocalObject.h:
+        * tao/LocalObject.inl:
+          Removed TAO_Local_Refcounted_Object, it is deprecated for years now
+
+        * tao/Objref_VarOut_T.h:
+          Doxygen changes
+
 Wed Aug 18 18:10:21 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_component/context_svh.cpp:
         * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-        
+
           Removed generation of the context servants's _narrow()
           method, it doesn't appear to be needed any more.
 
 Wed Aug 18 17:14:05 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_component/context_svh.cpp:
-        
+
           Cosmetic changes.
-          
+
         * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-        
+
           Modified generated _narrow() method for contexts, to
           increment the refcount, as with all other _narrow()
           methods.
@@ -21,7 +33,7 @@ Wed Aug 18 17:14:05 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 Wed Aug 18 15:04:49 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/ast/ast_root.cpp(destroy):
-        
+
           Removed unused local variable.
 
 Wed Aug 18 14:05:20 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
@@ -38,7 +50,7 @@ Wed Aug 18 14:05:20 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 Tue Aug 17 18:47:23 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/ast/ast_root.cpp:
-        
+
           Fixed bug in cleanup of root scope when TAO_IDL processes
           multiple files in one execution. Thanks to Olli Savia
           <ops@iki.fi> for reporting the problem.
diff --git a/TAO/docs/idltocpp0x/IDLC++0xRFP.odt b/TAO/docs/idltocpp0x/IDLC++0xRFP.odt
index 3fc24ab9677..17ffcdc774c 100644
--- a/TAO/docs/idltocpp0x/IDLC++0xRFP.odt
+++ b/TAO/docs/idltocpp0x/IDLC++0xRFP.odt
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index 35da4735bcb..45f39dfe11a 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -174,39 +174,6 @@ namespace CORBA
   };
 }   // End CORBA namespace
 
-
-//FUZZ: disable check_for_TAO_Local_RefCounted_Object
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-/**
- * @brief This class is there to keep backwards compatibility to the
- *        v1.1 C++ mapping
- */
-class TAO_Export TAO_Local_RefCounted_Object
-  : public virtual CORBA::LocalObject
-{
-  protected:
-     // Default constructor.
-     /**
-      * Make it protected to prevent instantiation of this class.
-      */
-     TAO_Local_RefCounted_Object (void);
-
-   private:
-
-     /**
-      * @name Unimplemented methods
-      */
-     //@{
-     TAO_Local_RefCounted_Object (const TAO_Local_RefCounted_Object &);
-     TAO_Local_RefCounted_Object & operator = (
-         const TAO_Local_RefCounted_Object &);
-     //@}
-};
-#endif
-
-//FUZZ: enable check_for_TAO_Local_RefCounted_Object
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl
index 190daa55590..81bf2f62c73 100644
--- a/TAO/tao/LocalObject.inl
+++ b/TAO/tao/LocalObject.inl
@@ -42,15 +42,4 @@ CORBA::LocalObject::LocalObject (void)
 {
 }
 
-//FUZZ: disable check_for_TAO_Local_RefCounted_Object
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-ACE_INLINE
-TAO_Local_RefCounted_Object::TAO_Local_RefCounted_Object (void)
-{
-}
-#endif
-
-//FUZZ: enable check_for_TAO_Local_RefCounted_Object
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index 5f0f2679fe1..d0f4a49414d 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -59,7 +59,7 @@ public:
   TAO_Objref_Var_T<T> & operator= (const TAO_Objref_Var_T<T> &);
   T * operator-> (void) const;
 
-  // Cast operators.
+  /// Cast operators.
   operator T * const & () const;
   operator T *& ();
 
@@ -74,7 +74,7 @@ public:
   _out_type     out (void);
   _retn_type    _retn (void);
 
-  // TAO extension.
+  /// TAO extension.
   _retn_type    ptr (void) const;
 
 protected: