diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-22 22:51:23 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-22 22:51:23 +0000 |
| commit | dc15d6f74631ce74e423e1a0925e48db83c95916 (patch) | |
| tree | 1477cdc73abcf05b15bca45a6b700f224fc6c8a1 | |
| parent | e30dd32f32e4739ec499763f9339cfe71f3b4a2b (diff) | |
| download | ATCD-dc15d6f74631ce74e423e1a0925e48db83c95916.tar.gz | |
ChangeLogTag:Sat May 22 16:57:38 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 11 | ||||
| -rw-r--r-- | ace/FlReactor.cpp | 6 | ||||
| -rw-r--r-- | tests/FlReactor_Test.cpp | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 37febd3d7a6..0cb33265170 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,14 @@ +Sat May 22 16:57:38 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/FlReactor.cpp: + Sun/CC doesn't like reinterpret cast when converting from an int + into an int; this is silly, but I cannot use static_cast because + on NT reinterpret_cast is the right thing. + Use old-style casts for the moment. + + * tests/FlReactor_Test.cpp: + Minor cosmetic fixes. + Sat May 22 16:36:14 1999 Chris Gill <cdgill@cs.wustl.edu> * ACE version 4.6.40 released. diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp index 74ac684b3c1..6759770eee4 100644 --- a/ace/FlReactor.cpp +++ b/ace/FlReactor.cpp @@ -110,7 +110,7 @@ void ACE_FlReactor::fl_io_proc (int fd, void* reactor) { ACE_FlReactor *self = ACE_static_cast(ACE_FlReactor *, reactor); - ACE_HANDLE handle = ACE_reinterpret_cast(ACE_HANDLE, fd); + ACE_HANDLE handle = (ACE_HANDLE)fd; //ACE_reinterpret_cast(ACE_HANDLE, fd); // my copy isn't const. ACE_Time_Value zero = ACE_Time_Value::zero; @@ -190,7 +190,7 @@ ACE_FlReactor::register_handler_i (ACE_HANDLE handle, if (condition != 0) { - Fl::add_fd (ACE_reinterpret_cast(int,handle), + Fl::add_fd ((int)handle, // ACE_reinterpret_cast(int,handle), ACE_FlReactor::fl_io_proc, this); } @@ -218,7 +218,7 @@ ACE_FlReactor::remove_handler_i (ACE_HANDLE handle, // in reverse order. // First clean up the corresponding X11Input. - Fl::remove_fd (ACE_reinterpret_cast(int,handle)); + Fl::remove_fd ((int)handle); // ACE_reinterpret_cast(int,handle)); // Now let the reactor do its work. return ACE_Select_Reactor::remove_handler_i (handle, diff --git a/tests/FlReactor_Test.cpp b/tests/FlReactor_Test.cpp index 81b7d869382..0c20c5a81b9 100644 --- a/tests/FlReactor_Test.cpp +++ b/tests/FlReactor_Test.cpp @@ -227,7 +227,7 @@ Acceptor::make_svc_handler (Connection_Handler *&sh) return 0; } -int main(int argc, char *argv[]) +int main (int argc, char *argv[]) { ACE_START_TEST (ASYS_TEXT ("FlReactor_Test")); |