diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-19 21:38:05 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-19 21:38:05 +0000 |
| commit | 98527b96e359d51325d105b5131542f66ee1b2d1 (patch) | |
| tree | 6a676ecfb882def7dc3eab10cfe3e79563e27101 | |
| parent | 3117a7a2e30a135f171b947d64817547e0667e53 (diff) | |
| download | ATCD-98527b96e359d51325d105b5131542f66ee1b2d1.tar.gz | |
ChangeLogTag:Wed May 19 16:21:11 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 6 | ||||
| -rw-r--r-- | TAO/tao/default_resource.cpp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index ffd245bd4f2..bee665314cd 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,9 @@ +Wed May 19 16:21:11 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/default_resource.cpp: + Fixed incorrect use of ACE_WIN32, ACE_HAS_FL and ACE_HAS_XT + macros, thanks to Jeff Parsons for reporting this. + Wed May 19 15:54:53 1999 Jeff Parsons <parsons@cs.wustl.edu> * tao/Typecode_Constants.cpp: diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 2bdfd9ee37f..9259f0aac9b 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -110,7 +110,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) else if (ACE_OS::strcasecmp (name, "select_st") == 0) reactor_type_ = TAO_REACTOR_SELECT_ST; else if (ACE_OS::strcasecmp (name, "fl_reactor") == 0) -#if ACE_HAS_FL +#if defined(ACE_HAS_FL) reactor_type_ = TAO_REACTOR_FL; #else ACE_DEBUG ((LM_DEBUG, @@ -118,7 +118,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) " not supported on this platform\n")); #endif /* ACE_HAS_FL */ else if (ACE_OS::strcasecmp (name, "xt_reactor") == 0) -#if ACE_HAS_XT +#if defined(ACE_HAS_XT) reactor_type_ = TAO_REACTOR_XT; #else ACE_DEBUG ((LM_DEBUG, @@ -126,7 +126,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) " not supported on this platform\n")); #endif /* ACE_HAS_XT */ else if (ACE_OS::strcasecmp (name, "WFMO") == 0) -#if ACE_WIN32 +#if defined(ACE_WIN32) reactor_type_ = TAO_REACTOR_WFMO; #else ACE_DEBUG ((LM_DEBUG, @@ -134,7 +134,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) " not supported on this platform\n")); #endif /* ACE_WIN32 */ else if (ACE_OS::strcasecmp (name, "MsgWFMO") == 0) -#if ACE_WIN32 +#if defined(ACE_WIN32) reactor_type_ = TAO_REACTOR_MSGWFMO; #else ACE_DEBUG ((LM_DEBUG, |