diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-18 04:50:06 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-18 04:50:06 +0000 |
| commit | c2c68ea167b7e482823c0900c628b9a1bda77d21 (patch) | |
| tree | 1c1caef6bef04f1698f6b05a115d24440e0067ae | |
| parent | c48be602db4deb4d42541c08a703fe9042b828e0 (diff) | |
| download | ATCD-c2c68ea167b7e482823c0900c628b9a1bda77d21.tar.gz | |
ChangeLogTag:Thu Sep 17 23:47:31 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 0aefe826419..e7c822a631d 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,11 @@ +Thu Sep 17 23:47:31 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp: + Added the correct template instantiations for IRIX 6.2 + + * tao/ORB_Core.cpp: + Minor fix in argument parsing. + Thu Sep 17 22:52:48 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * TAO_IDL/be/be_sunsoft.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index e5ee74a80d1..3eb8493f938 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -1151,7 +1151,7 @@ template CORBA::Boolean TAO_find (const CosTradingSequences::ULongSeq&, const CO template CORBA::Boolean TAO_find (const CosTradingSequences::LongSeq&, const CORBA::Long); template CORBA::Boolean TAO_find (const CosTradingSequences::ShortSeq&, const CORBA::Long); template CORBA::Boolean TAO_find (const CosTradingSequences::UShortSeq&, const CORBA::ULong); -template CORBA::Boolean TAO_find (const CosTradingSequences::StringSeq&, const char*); +template CORBA::Boolean TAO_find (const CosTradingSequences::StringSeq&, const char* const); #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Node<TAO_Literal_Constraint> #pragma instantiate ACE_Unbounded_Queue<TAO_Literal_Constraint> diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 9ef5d17e32d..567f91fe3e0 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -353,7 +353,7 @@ TAO_ORB_Core::init (int &argc, char *argv[]) arg_shifter.consume_arg (); } } - else if (ACE_OS::strcmp (current_arg, "-ORBCDRtradeoff") == 0) + else if (ACE_OS::strcmp (current_arg, "-ORBcdrtradeoff") == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) |