ChangeLogTag:Wed Mar 17 13:56:05 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

6 files changed, 22 insertions, 209 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0f4371317cd..1d6a3e7fa22 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Wed Mar 17 13:56:05 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/CORBA_String.cpp:
+
+	  Reverted the change "Tue Mar 16 09:36:42 2004  Balachandran
+	  Natarajan  <bala@dre.vanderbilt.edu>" since MSVC barfs. 
+	  
+	* tao/ULongSeqS.cpp:
+	* tao/ULongSeqS.i:
+	* tao/UShortSeqS.cpp:
+	* tao/UShortSeqS.i:
+
+	  They serve no purpose. So removed them from the repo.
+
 Wed Mar 17 10:12:05 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* orbsvcs/Scheduling_Service/Makefile:
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
index c3e2336dab4..d44dfd01147 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -240,9 +240,7 @@ istream &
 operator>> (istream &is, CORBA::String_var &sv)
 {
   is.seekg (0, ios::end);
-  const std::streampos endpos = is.tellg ();
-  const std::streamoff endoff = std::streamoff (endpos);
-  sv = CORBA::string_alloc ((CORBA::ULong) endoff);
+  sv = CORBA::string_alloc (is.tellg ());
   is.seekg (0, ios::beg);
   is >> sv.inout ();
   return is;
@@ -259,9 +257,7 @@ istream &
 operator>> (istream &is, CORBA::String_out &so)
 {
   is.seekg (0, ios::end);
-  const std::streampos endpos = is.tellg ();
-  const std::streamoff endoff = std::streamoff (endpos);
-  so = CORBA::string_alloc ((CORBA::ULong) endoff);
+  so = CORBA::string_alloc (is.tellg ());
   is.seekg (0, ios::beg);
   is >> so.ptr ();
   return is;
@@ -289,9 +285,7 @@ operator>> (istream &is, CORBA::WString_var &wsv)
 {
   is.seekg (0, ios::end);
   // @@ is.tellg()/sizeof(CORBA::WChar) instead?
-  const std::streampos endpos = is.tellg ();
-  const std::streamoff endoff = std::streamoff (endpos);
-  const CORBA::ULong len = (CORBA::ULong) endoff;
+  const CORBA::ULong len = is.tellg ();
   wsv = CORBA::wstring_alloc (len);
   is.seekg (0, ios::beg);
 
@@ -330,9 +324,7 @@ operator>> (istream &is, CORBA::WString_out &wso)
 {
   is.seekg (0, ios::end);
   // @@ is.tellg()/sizeof(CORBA::WChar) instead?
-  const std::streampos endpos = is.tellg ();
-  const std::streamoff endoff = std::streamoff (endpos);
-  const CORBA::ULong len = (CORBA::ULong) endoff;
+  const CORBA::ULong len = is.tellg ();
   wso = CORBA::wstring_alloc (len);
   is.seekg (0, ios::beg);
 
diff --git a/TAO/tao/ULongSeqS.cpp b/TAO/tao/ULongSeqS.cpp
deleted file mode 100644
index 56e0c895eaa..00000000000
--- a/TAO/tao/ULongSeqS.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be/be_codegen.cpp:631
-
-#ifndef _TAO_IDL_ORIG_ULONGSEQS_CPP_
-#define _TAO_IDL_ORIG_ULONGSEQS_CPP_
-
-
-#include "ULongSeqS.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/Operation_Table.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Typecode.h"
-#include "tao/DynamicC.h"
-#include "tao/PortableInterceptor.h"
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/PICurrent.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
-#include "tao/PortableServer/ServerInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "ULongSeqS.i"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:64
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1764
-
-#if 0 
-/* Useful at a later date.
-At present will be commented out */
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-#endif /*if 0*/ 
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/ULongSeqS.h b/TAO/tao/ULongSeqS.h
index c5d1cf9c74f..291cad079f8 100644
--- a/TAO/tao/ULongSeqS.h
+++ b/TAO/tao/ULongSeqS.h
@@ -59,21 +59,17 @@
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_codegen.cpp:1014
 
 
-#if defined (__ACE_INLINE__)
-#include "ULongSeqS.i"
-#endif /* defined INLINE */
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/UShortSeqS.cpp b/TAO/tao/UShortSeqS.cpp
deleted file mode 100644
index 51ec5868f23..00000000000
--- a/TAO/tao/UShortSeqS.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be/be_codegen.cpp:631
-
-#ifndef _TAO_IDL_ORIG_USHORTSEQS_CPP_
-#define _TAO_IDL_ORIG_USHORTSEQS_CPP_
-
-
-#include "UShortSeqS.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/Operation_Table.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Typecode.h"
-#include "tao/DynamicC.h"
-#include "tao/PortableInterceptor.h"
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/PICurrent.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
-#include "tao/PortableServer/ServerInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "UShortSeqS.i"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:64
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1764
-
-#if 0 
-/* Useful at a later date.
-At present will be commented out */
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-#endif /*if 0*/ 
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/UShortSeqS.h b/TAO/tao/UShortSeqS.h
index 4723e301403..a5ad94c61c9 100644
--- a/TAO/tao/UShortSeqS.h
+++ b/TAO/tao/UShortSeqS.h
@@ -59,21 +59,16 @@
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_codegen.cpp:1014
 
-
-#if defined (__ACE_INLINE__)
-#include "UShortSeqS.i"
-#endif /* defined INLINE */
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */