diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/tao/BooleanSeq.pidl | 6 | ||||
| -rw-r--r-- | TAO/tao/CONV_FRAME.pidl | 2 | ||||
| -rw-r--r-- | TAO/tao/CharSeq.pidl | 20 | ||||
| -rw-r--r-- | TAO/tao/Current.pidl | 16 | ||||
| -rw-r--r-- | TAO/tao/ORBInitializer_Registry.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/ORBInitializer_Registry_Adapter.h | 2 | ||||
| -rw-r--r-- | TAO/tao/PI/ORBInitializer_Registry_Impl.cpp | 3 |
8 files changed, 30 insertions, 38 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index da7f08a1a68..f50ed1b5734 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,20 @@ +Wed Jul 18 12:40:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/ORBInitializer_Registry.cpp: + Corrected comment + + * tao/ORBInitializer_Registry_Adapter.h: + Fixed doxygen tags + + * tao/PI/ORBInitializer_Registry_Impl.cpp: + Layout change + + * tao/BooleanSeq.pidl: + * tao/CharSeq.pidl: + * tao/CONV_FRAME.pidl: + * tao/Current.pidl: + Updated file header. + Wed Jul 18 12:06:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp: diff --git a/TAO/tao/BooleanSeq.pidl b/TAO/tao/BooleanSeq.pidl index 8042cc7c138..2d8461b7656 100644 --- a/TAO/tao/BooleanSeq.pidl +++ b/TAO/tao/BooleanSeq.pidl @@ -3,7 +3,11 @@ // $Id$ /** - * This file is used to generate the code in BooleanSeqC.* + * @file BooleanSeq.pidl + * + * $Id$ + * + * This file is used to generate the code in BooleanSeqC.* */ #ifndef TAO_CORBA_BOOLEAN_SEQ_IDL diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl index 13fb9f106a8..579a669d967 100644 --- a/TAO/tao/CONV_FRAME.pidl +++ b/TAO/tao/CONV_FRAME.pidl @@ -5,7 +5,7 @@ * * $Id$ * - * This file is used to generate CONV_FRAMEC.{h,cpp}, using the + * This file is used to generate CONV_FRAMEC.* */ #ifndef TAO_CORBA_CONV_FRAME_PIDL diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl index 8102da205b1..53c848a8e7e 100644 --- a/TAO/tao/CharSeq.pidl +++ b/TAO/tao/CharSeq.pidl @@ -1,23 +1,11 @@ // -*- IDL -*- -// -// $Id$ /** - * This file was used to generate the code in CharSeqC.* - * The command used to generate code is: + * @file CharSeq.pidl + * + * $Id$ * - * tao_idl - * -oA AnyTypeCode - * -GA -SS -Sci - * -Wb,pre_include=ace/pre.h - * -Wb,post_include=ace/post.h - * -Wb,export_macro=TAO_Export - * -Wb,export_include=tao/TAO_Export.h - * -Wb,anyop_export_macro=TAO_AnyTypeCode_Export - * -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL - * CharSeq.pidl + * This file was used to generate the code in CharSeqC.* */ #ifndef TAO_CORBA_CHAR_SEQ_IDL diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl index 895a144048b..4ca7d17cfc1 100644 --- a/TAO/tao/Current.pidl +++ b/TAO/tao/Current.pidl @@ -5,21 +5,7 @@ * * $Id$ * - * This file is used to generate CurrentC.{h,cpp}, using the - * following command: - * - * tao_idl.exe - * -o orig -Gp -Gd -GA -SS -Sci - * -Wb,export_macro=TAO_Export - * -Wb,export_include="tao/TAO_Export.h" - * -Wb,pre_include="ace/pre.h" - * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL - * Current.pidl - * - * - * The files are ready to use. + * This file is used to generate CurrentC.* */ #ifndef TAO_CURRENT_PIDL diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 1259646eace..4d06bedfccf 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -45,7 +45,7 @@ namespace PortableInterceptor TAO::ORB::init_orb_globals (); } - // If not, lookup it up. + // If not, look it up. TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_ = ACE_Dynamic_Service<TAO::ORBInitializer_Registry_Adapter>::instance ("ORBInitializer_Registry", true); // only look in the local repo diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index a450106d554..c5f7469dbe6 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -80,8 +80,6 @@ namespace TAO * @param argc Number of arguments * @param argv Argv array * @param slotid The slot id - * @param picurrent PI Current, if this is not null, the concrete - * implementation will update the slot id */ virtual void post_init ( size_t pre_init_count, diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index aaf52051708..d25f5a643ab 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -56,8 +56,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) orb_initializer = temp_orb_initializer; - this->register_orb_initializer (orb_initializer.in () - ); + this->register_orb_initializer (orb_initializer.in ()); } catch (const ::CORBA::Exception& ex) { |