diff options
| author | vishal <vishal@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-21 20:50:56 +0000 |
|---|---|---|
| committer | vishal <vishal@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-21 20:50:56 +0000 |
| commit | 5280aae14dc9179aa75eb7959b961dd76eb5a749 (patch) | |
| tree | 21fa1fb75c6049f4f38aebd60899b67a261945e8 | |
| parent | 6e8f904343596bcd0e7817b4cb90e126363c0987 (diff) | |
| download | ATCD-5280aae14dc9179aa75eb7959b961dd76eb5a749.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-99c | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 477ffe96889..f54da7bfc8e 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,8 @@ +Sun Mar 21 14:47:12 1999 Vishal Kachroo <vishal@merengue.cs.wustl.edu> + + * orbsvcs/orbsvcs/Time/TAO_UTO.cpp (TAO_UTO): Used + #ifdef (ACE_LACKS_U_LONGLONG_T) instead of #ifdef (VXWORKS)||(CHORUS) + Sat Mar 20 23:38:39 1999 Irfan Pyarali <irfan@cs.wustl.edu> * orbsvcs/orbsvcs/orbsvcs.dsp: @@ -297,7 +302,6 @@ Wed Mar 17 22:53:33 1999 Irfan Pyarali <irfan@cs.wustl.edu> * tao/POA.cpp: Phase one of the new POA design is complete. -<<<<<<< ChangeLog - We now have support for active demuxing of user defined ids. This is achieved by using a active demux hint field in the object key. @@ -381,7 +385,7 @@ Wed Mar 17 22:53:33 1999 Irfan Pyarali <irfan@cs.wustl.edu> * examples/POA/Loader/run_test.pl: * examples/POA/On_Demand_Loading/run_test.pl: * examples/POA/On_Demand_Activation/run_test.pl: -======= + - We now have support for active demuxing of user defined ids. This is achieved by using a active demux hint field in the object key. @@ -465,7 +469,6 @@ Wed Mar 17 22:53:33 1999 Irfan Pyarali <irfan@cs.wustl.edu> * examples/POA/Loader/run_test.pl: * examples/POA/On_Demand_Loading/run_test.pl: * examples/POA/On_Demand_Activation/run_test.pl: ->>>>>>> 1.524 Fixed the above scripts to pass the extra parameters along to the client and the server. diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 4246a6d0a00..e352df2bff8 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -19,7 +19,7 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time, // Extract the lower 16 bits of the remaining bits. 'And'ing with 0xFFFF // is only a sanity check. -#if defined (VXWORKS) || defined (CHORUS) +#if defined (ACE_LACKS_U_LONGLONG_T) this->attr_utc_time_.inacchi = 0; #else this->attr_utc_time_.inacchi = (CORBA::UShort) (inaccuracy >> 32) & (0xFFFF); |