diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-27 21:56:24 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-27 21:56:24 +0000 |
| commit | f9de97984fddd8d5cb85d5a15729d661d2240a10 (patch) | |
| tree | 8c539750e6f2073b1e93033ad5d09edc03aad9d7 | |
| parent | 05e17048d88934947e776eb73e0a2cbcd3edb700 (diff) | |
| download | ATCD-f9de97984fddd8d5cb85d5a15729d661d2240a10.tar.gz | |
ChangeLogTag: Mon Dec 27 15:55:06 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 35 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 4 |
2 files changed, 24 insertions, 15 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 5299642a7c6..c3b8417a4c0 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,18 +1,27 @@ +Mon Dec 27 15:55:06 1999 David L. Levine <levine@cs.wustl.edu> + + * tao/ORB.cpp: reverted this change: + + Thu Dec 23 08:39:50 1999 David L. Levine <levine@cs.wustl.edu> + + because it's not necessary when the g++ headers are + not #included by cxx (which they shouldn't). + Fri Dec 24 23:55:00 1999 Kirthika Parameswaran <kirthika@cs.wustl.edu> - * tests/Smart_Proxies/On_Demand/client.cpp: - * tests/Smart_Proxies/On_Demand/server.cpp: - * tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.{h, cpp}: - * tests/Smart_Proxies/On_Demand/Smart_Test_Factory.{h, cpp}: - * tests/Smart_Proxies/On_Demand/README: - * tests/Smart_Proxies/On_Demand/Makefile: - * tests/Smart_Proxies/On_Demand/run_test.pl: - * tests/Smart_Proxies/On_Demand/svc.conf: - * tests/Smart_Proxies/On_Demand/test.idl: - - This test extends the Smart Proxy test and provides on demand - activation of the smart proxy using the svc.conf file. - + * tests/Smart_Proxies/On_Demand/client.cpp: + * tests/Smart_Proxies/On_Demand/server.cpp: + * tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.{h, cpp}: + * tests/Smart_Proxies/On_Demand/Smart_Test_Factory.{h, cpp}: + * tests/Smart_Proxies/On_Demand/README: + * tests/Smart_Proxies/On_Demand/Makefile: + * tests/Smart_Proxies/On_Demand/run_test.pl: + * tests/Smart_Proxies/On_Demand/svc.conf: + * tests/Smart_Proxies/On_Demand/test.idl: + + This test extends the Smart Proxy test and provides on demand + activation of the smart proxy using the svc.conf file. + Fri Dec 24 12:28:00 1999 David L. Levine <levine@cs.wustl.edu> * examples/Simulator/Event_Supplier/DualEC_Sup.cpp (shutdown): diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index dc0b48a7898..60477d82427 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -53,9 +53,9 @@ # else # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) # include /**/ <exception> -# if !defined (ACE_WIN32) && !defined (__DECCXX) +# if !defined (ACE_WIN32) using std::set_unexpected; -# endif /* ! ACE_WIN32 && ! __DECCXX */ +# endif /* ! ACE_WIN32 */ # else # include /**/ <exception.h> # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ |