ChangeLogTag: Thu Sep 3 01:30:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de>

6 files changed, 20 insertions, 8 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 855eb014687..6673966f86c 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,15 @@
+Thu Sep  3 01:30:00 1999  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
+
+	* tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+	  tests/NestedUpcall/Triangle_Test/Object_A_i.h
+	  tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+	  tests/NestedUpcall/Triangle_Test/Object_B_i.h
+	  tests/NestedUpcall/Triangle_Test/Triangle_Test.idl:
+	  According to the changes in the IDL compiler, which
+	  made it conforming to the CORBA spec, some minor
+	  bugs were fixed. These were that identifier
+	  spellings only differed in case.
+
 Thu Sep  2 22:14:59 1999  Pradeep Gore  <pradeep@danzon.cs.wustl.edu>
 
 	* example/simple/chat/Broadcaster.idl:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index 5fb8662e2df..0a9a29e6fcc 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -36,7 +36,7 @@ Object_A_i::~Object_A_i (void)
 
 
 void
-Object_A_i::foo (Initiator_ptr initiator_ptr,
+Object_A_i::foo (Initiator_ptr theInitiator_ptr,
                     CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -45,7 +45,7 @@ Object_A_i::foo (Initiator_ptr initiator_ptr,
 
   ACE_TRY
     {
-      initiator_ptr->foo_object_B (ACE_TRY_ENV);
+      theInitiator_ptr->foo_object_B (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       while (!this->finish_two_way_call_)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index 31695b5c779..3c829cca935 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -34,7 +34,7 @@ public:
   virtual ~Object_A_i (void);
   // Destructor.
 
-  virtual void foo (Initiator_ptr initiator_ptr,
+  virtual void foo (Initiator_ptr theInitiator_ptr,
                     CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index b7efa50682b..49c5912f341 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -35,7 +35,7 @@ Object_B_i::~Object_B_i (void)
 
 
 void
-Object_B_i::foo (Object_A_ptr object_A_ptr,
+Object_B_i::foo (Object_A_ptr theObject_A_ptr,
                  CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -48,7 +48,7 @@ Object_B_i::foo (Object_A_ptr object_A_ptr,
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n"));
 
-      object_A_ptr->finish (ACE_TRY_ENV);
+      theObject_A_ptr->finish (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Start to wait on this variable, it is set to true
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 6cb4bc173a9..9d664fa235d 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -34,7 +34,7 @@ public:
   virtual ~Object_B_i (void);
   // Destructor.
 
-  virtual void foo(Object_A_ptr object_A_ptr,
+  virtual void foo(Object_A_ptr theObject_A_ptr,
                    CORBA::Environment &env)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl
index cb9ee8d1728..485d1f0edc5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl
@@ -25,7 +25,7 @@ interface Initiator {
 
 interface Object_A {
 
-  void foo (in Initiator initiator);
+  void foo (in Initiator theInitiator);
   
   oneway void finish ();
 
@@ -33,6 +33,6 @@ interface Object_A {
 
 interface Object_B {
 
-  void foo (in Object_A object_A);
+  void foo (in Object_A theObject_A);
 
 };