1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp
index 836192bc71a..bb93ab70c34 100644
--- a/TAO/tao/Valuetype/StringValueC.cpp
+++ b/TAO/tao/Valuetype/StringValueC.cpp
@@ -39,7 +39,7 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
-#include "tao/Valuetype/StringValueC.h"
+#include "StringValueC.h"
 #include "tao/Valuetype/ValueFactory.h"
 #include "tao/CDR.h"
 
@@ -48,14 +48,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Valuetype/StringValueC.inl"
+#include "StringValueC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // .\be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -80,16 +78,18 @@ namespace CORBA
     &_tao_tc_CORBA_StringValue;
 }
 
-// TAO_IDL - Generated from
-// c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63
 
-CORBA::StringValue::~StringValue (void)
-{
-}
 
+// TAO_IDL - Generated from
+// c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63
 CORBA::StringValue *
 CORBA::StringValue::_downcast (CORBA::ValueBase *v)
 {
+  if (v == 0)
+    {
+      return 0;
+    }
+
   return dynamic_cast< ::CORBA::StringValue * > (v);
 }
 
@@ -166,13 +166,14 @@ namespace CORBA
 
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63
-CORBA::WStringValue::~WStringValue (void)
-{
-}
-
 CORBA::WStringValue *
 CORBA::WStringValue::_downcast (CORBA::ValueBase *v)
 {
+  if (v == 0)
+    {
+      return 0;
+    }
+
   return dynamic_cast< ::CORBA::WStringValue * > (v);
 }
 
@@ -401,4 +402,3 @@ operator>> (
   return CORBA::WStringValue::_tao_unmarshal (strm, _tao_valuebox);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL