diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-14 16:27:57 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-14 16:27:57 +0000 |
| commit | 808de7baffb608e832565c92126d0c1994ae0f7e (patch) | |
| tree | 2c4de08e0befeff2fd5dc5bf1de3a4e5fc331e0d /TAO/examples | |
| parent | b1c55e17370fc48b4a8a61975f166912836a6543 (diff) | |
| download | ATCD-808de7baffb608e832565c92126d0c1994ae0f7e.tar.gz | |
ChangeLogTag:Mon Feb 14 08:25:32 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'TAO/examples')
| -rw-r--r-- | TAO/examples/Simple/time/Time.idl | 2 | ||||
| -rw-r--r-- | TAO/examples/Simple/time/Time_Client_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/examples/Simple/time/Time_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/examples/Simple/time/Time_i.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/TAO/examples/Simple/time/Time.idl b/TAO/examples/Simple/time/Time.idl index ffbdc5cc49c..66521161fab 100644 --- a/TAO/examples/Simple/time/Time.idl +++ b/TAO/examples/Simple/time/Time.idl @@ -7,7 +7,7 @@ interface Time // Defines an interface that encapsulates operations that // return the current time of day and shuts down the server. - long time (); + long current_time (); // Returns the current time of day on another machine. oneway void shutdown (); diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index 7b355c10be8..6880a8ae3eb 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -30,7 +30,7 @@ Time_Client_i::run (const char *name, ACE_TRY { //Make the RMI. - CORBA::Long timedate = client->time (ACE_TRY_ENV); + CORBA::Long timedate = client->current_time (ACE_TRY_ENV); ACE_TRY_CHECK; // Print out value diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp index 120cba137c8..5e49361a835 100644 --- a/TAO/examples/Simple/time/Time_i.cpp +++ b/TAO/examples/Simple/time/Time_i.cpp @@ -35,7 +35,7 @@ Time_i::orb (CORBA::ORB_ptr o) // Return the current date/time on the server. CORBA::Long -Time_i::time (CORBA::Environment &) +Time_i::current_time (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Long (ACE_OS::time (0)); diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h index 2094dde61d2..68f4058ab98 100644 --- a/TAO/examples/Simple/time/Time_i.h +++ b/TAO/examples/Simple/time/Time_i.h @@ -43,7 +43,7 @@ public: ~Time_i (void); // Destructor - virtual CORBA::Long time (CORBA::Environment &env) + virtual CORBA::Long current_time (CORBA::Environment &env) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the current time/date on the server |