diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-03-04 07:37:09 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-03-04 07:37:09 +0000 |
| commit | 65f8e1dffec5a62be6158994b08b059c0669639d (patch) | |
| tree | 2fe3b0bcf4c85b55b8cebc6c94e877d1044b94f5 | |
| parent | c4acbb87a8287cc84b53d93e2388d49826834cef (diff) | |
| download | ATCD-65f8e1dffec5a62be6158994b08b059c0669639d.tar.gz | |
ChangeLogTag:Sat Mar 03 23:32:29 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tests/AMI_Timeouts/timeout_client.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/AMI_Timeouts/timeout_client.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b9fedcadd3b..0b65a3fa8cd 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Sat Mar 03 23:32:29 2001 Ossama Othman <ossama@uci.edu> + + * tests/AMI_Timeouts/timeout_client.cpp (init): + * tests/AMI_Timeouts/timeout_client.cpp (init, svc): + + Renamed "init()" method to "initialize()." It conflicted with + its base class "ACE_Task_Base::init()" method. + Sat Mar 03 22:56:20 2001 Ossama Othman <ossama@uci.edu> * tests/AMI_Timeouts/client.cpp (main): diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index eae9d4699ff..bbeda7053b8 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -41,7 +41,7 @@ TimeoutClient::~TimeoutClient () int TimeoutClient::svc () { - this->init (); + this->initialize (); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -86,7 +86,7 @@ TimeoutClient::svc () int -TimeoutClient::init () +TimeoutClient::initialize () { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/tests/AMI_Timeouts/timeout_client.h b/TAO/tests/AMI_Timeouts/timeout_client.h index d1897d9b426..a3d22d1f51e 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.h +++ b/TAO/tests/AMI_Timeouts/timeout_client.h @@ -38,7 +38,7 @@ public: private: // Initialize the context of this class. - int init (); + int initialize (); // Run in a separate thread. virtual int svc (void ); |