summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2000-03-28 01:41:01 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2000-03-28 01:41:01 +0000
commite0fd18a809d11c4cb93b005b18d41143ea4bdc96 (patch)
tree6a4ffa8ca85ef2d92fa556eda52356ce7d70170b
parente14d70451f35fe2aa9e6214ea66a10d1c27dd758 (diff)
downloadATCD-e0fd18a809d11c4cb93b005b18d41143ea4bdc96.tar.gz
ChangeLogTag:Mon Mar 27 17:27:40 2000 Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/tao/ORB.cpp6
-rw-r--r--THANKS1
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a698cc8563b..0ad633c7bbc 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Mon Mar 27 19:27:00 2000 Douglas C. Schmidt <schmidt@danzon.cs.wustl.edu>
+
+ * tao/ORB.cpp (ORB_init): Replace CORBA::Environment with
+ CORBA_Environment to be consistent. Thanks to Yangfen Qiu
+ <yqiu@thomas.com> for motivating this change.
+
Mon Mar 27 16:11:29 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* tao: The following changes allows the user finer grain control
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 2f5fadea0c1..47aac74ee66 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1410,7 +1410,7 @@ void CORBA_ORB::_tao_unexpected_exception (void)
CORBA::ORB_ptr
CORBA::ORB_init (int &argc,
char *argv[],
- const char * orb_name)
+ const char *orb_name)
{
return CORBA::ORB_init (argc,
argv,
@@ -1421,8 +1421,8 @@ CORBA::ORB_init (int &argc,
CORBA::ORB_ptr
CORBA::ORB_init (int &argc,
char *argv[],
- const char * orbid,
- CORBA::Environment &ACE_TRY_ENV)
+ const char *orbid,
+ CORBA_Environment &ACE_TRY_ENV)
{
// Using ACE_Static_Object_Lock::instance() precludes <ORB_init>
// from being called within a static object CTOR.
diff --git a/THANKS b/THANKS
index 87972caf3d9..f19f11a0113 100644
--- a/THANKS
+++ b/THANKS
@@ -941,6 +941,7 @@ Manuel Benche <mbenche@jazz.cs.utsa.edu>
Steve Luoma <stevel@dvc400.com>
Roger Tragin <rtragin@wpine.com>
Alex Bangs <bangs@entelos.com>
+Yangfen Qiu <yqiu@thomas.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson. Paul devised the recursive Makefile scheme that