diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-18 04:01:14 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-18 04:01:14 +0000 |
| commit | 0bcbce544c017790564be2fe6db3d17a4f718c69 (patch) | |
| tree | a28802ed4f4442ac2905047df47cf122f901eed5 | |
| parent | 9a5fa84319226d0a0ade4d6072620594622a8979 (diff) | |
| download | ATCD-0bcbce544c017790564be2fe6db3d17a4f718c69.tar.gz | |
ChangeLogTag:Wed May 17 20:57:49 2000 Darrell Brunsch <brunsch@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c0f6f4a9a7a..76c6612dec7 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Wed May 17 20:57:49 2000 Darrell Brunsch <brunsch@uci.edu> + + * tao/ORB.cpp: + + The using std::set_unexpected needed to be used in Borland, + so I changed the #if guard around it to check for _MSC_VER + instead of ACE_WIN32. + Wed May 17 12:11:17 2000 Darrell Brunsch <brunsch@uci.edu> * tao/default_resource.cpp (allocate_reactor_impl): diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 4595e23b2e7..6eaac109988 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -45,9 +45,9 @@ # else # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) # include /**/ <exception> -# if !defined (ACE_WIN32) +# if !defined (_MSC_VER) using std::set_unexpected; -# endif /* ! ACE_WIN32 */ +# endif /* !_MSC_VER */ # else # include /**/ <exception.h> # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ |