From e027f0a8bf8e13aed7b9997c75ac42ab514b24a1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 4 Jan 2005 12:54:22 +0000 Subject: ChangeLogTag: Tue Jan 4 12:39:12 UTC 2005 Johnny Willemsen --- TAO/tao/Makefile.am | 6 +++--- TAO/tao/ShortSeqA.cpp | 35 +++++++++++++++++------------------ TAO/tao/ShortSeqC.cpp | 14 ++++++-------- TAO/tao/ShortSeqC.h | 15 ++++++++------- TAO/tao/ShortSeqC.i | 28 ---------------------------- TAO/tao/ShortSeqC.inl | 27 +++++++++++++++++++++++++++ TAO/tao/ShortSeqS.h | 21 +++++++++------------ 7 files changed, 70 insertions(+), 76 deletions(-) delete mode 100644 TAO/tao/ShortSeqC.i create mode 100644 TAO/tao/ShortSeqC.inl diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 8b84f25b502..aa1a8194572 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -811,7 +811,7 @@ nobase_include_HEADERS += \ ServicesC.inl \ ServicesS.inl \ ServicesS_T.inl \ - ShortSeqC.i \ + ShortSeqC.inl \ Special_Basic_Argument_T.inl \ Special_Basic_SArgument_T.inl \ StringSeqC.inl \ @@ -820,8 +820,8 @@ nobase_include_HEADERS += \ Synch_Refcountable.inl \ SystemException.inl \ TAOC.inl \ - TAOS.i \ - TAOS_T.i \ + TAOS.inl \ + TAOS_T.inl \ TAO_Server_Request.i \ TAO_Singleton.inl \ TAO_Singleton_Manager.inl \ diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp index 92b62c6ba24..d726cffce46 100644 --- a/TAO/tao/ShortSeqA.cpp +++ b/TAO/tao/ShortSeqA.cpp @@ -27,26 +27,28 @@ #include "ShortSeqC.h" #include "tao/Typecode.h" +#include "tao/CDR.h" +#include "tao/Any.h" #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:290 +// be\be_visitor_typecode/typecode_defn.cpp:295 static const CORBA::Long _oc_CORBA_ShortSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5368), - ACE_NTOHL (0x6f727453), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5368), + ACE_NTOHL (0x6f727453), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ShortSeq:1.0 9, - ACE_NTOHL (0x53686f72), - ACE_NTOHL (0x74536571), + ACE_NTOHL (0x53686f72), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = ShortSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ShortSeq ( sizeof (_oc_CORBA_ShortSeq), (char *) &_oc_CORBA_ShortSeq, 0, - sizeof (CORBA::ShortSeq) + 0 ); namespace CORBA @@ -71,7 +73,7 @@ namespace CORBA &_tc_TAO_tc_CORBA_ShortSeq; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -108,8 +110,8 @@ CORBA::Boolean operator>>= ( CORBA::ShortSeq *&_tao_elem ) { - return _tao_any >>= ACE_const_cast ( - const CORBA::ShortSeq *&, + return _tao_any >>= const_cast< + const CORBA::ShortSeq *&> ( _tao_elem ); } @@ -129,8 +131,6 @@ CORBA::Boolean operator>>= ( ); } - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class @@ -145,5 +145,4 @@ CORBA::Boolean operator>>= ( CORBA::ShortSeq \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp index ad8535f8696..1a3e8fe82bf 100644 --- a/TAO/tao/ShortSeqC.cpp +++ b/TAO/tao/ShortSeqC.cpp @@ -26,23 +26,22 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:323 +// be\be_codegen.cpp:302 #include "ShortSeqC.h" #include "tao/CDR.h" -#include "tao/Typecode.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "ShortSeqC.i" +#include "ShortSeqC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:64 +// be\be_visitor_arg_traits.cpp:65 // Arg traits specializations. namespace TAO @@ -97,7 +96,7 @@ void CORBA::ShortSeq::_tao_any_destructor ( ) { ShortSeq * _tao_tmp_pointer = - ACE_static_cast (ShortSeq *, _tao_void_pointer); + static_cast (_tao_void_pointer); delete _tao_tmp_pointer; } @@ -114,7 +113,7 @@ CORBA::Boolean operator<< ( const CORBA::ShortSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len = _tao_sequence.length (); + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); if (strm << _tao_seq_len) { @@ -162,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1628 +// be\be_visitor_root/root.cpp:1629 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -207,4 +206,3 @@ CORBA::Boolean operator>> ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h index ea3c5ee413f..d055abe73af 100644 --- a/TAO/tao/ShortSeqC.h +++ b/TAO/tao/ShortSeqC.h @@ -26,20 +26,22 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:171 +// be\be_codegen.cpp:153 #ifndef _TAO_IDL_ORIG_SHORTSEQC_H_ #define _TAO_IDL_ORIG_SHORTSEQC_H_ #include /**/ "ace/pre.h" -#include "tao/ORB.h" + +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/TAO_Export.h" +#include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" #include "tao/Seq_Var_T.h" @@ -58,9 +60,7 @@ #endif /* TAO_EXPORT_NESTED_CLASSES */ #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -166,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:978 +// be\be_codegen.cpp:961 #if defined (__ACE_INLINE__) -#include "ShortSeqC.i" +#include "ShortSeqC.inl" #endif /* defined INLINE */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ @@ -184,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* ifndef */ + diff --git a/TAO/tao/ShortSeqC.i b/TAO/tao/ShortSeqC.i deleted file mode 100644 index 38aa32569ba..00000000000 --- a/TAO/tao/ShortSeqC.i +++ /dev/null @@ -1,28 +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 - - diff --git a/TAO/tao/ShortSeqC.inl b/TAO/tao/ShortSeqC.inl new file mode 100644 index 00000000000..c944d806c1f --- /dev/null +++ b/TAO/tao/ShortSeqC.inl @@ -0,0 +1,27 @@ +// -*- 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 + diff --git a/TAO/tao/ShortSeqS.h b/TAO/tao/ShortSeqS.h index 10428ca5329..17d9ae90fd7 100644 --- a/TAO/tao/ShortSeqS.h +++ b/TAO/tao/ShortSeqS.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// .\be\be_codegen.cpp:411 +// be\be_codegen.cpp:390 #ifndef _TAO_IDL_ORIG_SHORTSEQS_H_ #define _TAO_IDL_ORIG_SHORTSEQS_H_ @@ -39,14 +39,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Collocation_Proxy_Broker.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Base.h" #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -55,21 +50,22 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 +// be\be_visitor_module/module_sh.cpp:49 namespace POA_CORBA { - + // TAO_IDL - Generated from -// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 +// be\be_visitor_module/module_sh.cpp:80 } // module CORBA -// TAO_IDL - Generated from -// .\be\be_codegen.cpp:1014 +// TAO_IDL - Generated from +// be\be_codegen.cpp:997 + -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ @@ -79,3 +75,4 @@ namespace POA_CORBA #include /**/ "ace/post.h" #endif /* ifndef */ + -- cgit v1.2.1