diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | ace/OS_NS_math.inl | 36 | ||||
| -rw-r--r-- | ace/OS_NS_unistd.inl | 2 | ||||
| -rw-r--r-- | ace/README | 2 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 1 |
5 files changed, 37 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index a2e434413b1..062bf50bff1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Fri Jan 7 11:38:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_math.inl: + Replaced ACE_OS:: before each method with namespace ACE_OS {}, + hopefully this fixes the compile warnings in the SuSE 8 fuzz builds. + Thanks to Steve Huston for this idea. + + * ace/config-vxworks5.x.h: + Removed ACE_HAS_NONCONST_RMDIR, rmdir has a const char* on VxWorks + + * ace/OS_NS_unistd.inl (rmdir): + Removed part with ACE_HAS_NONCONST_RMDIR, there are no config files + anymore that define this + + * ace/README: + Removed ACE_HAS_NONCONST_RMDIR + Thu Jan 6 18:29:22 2005 Steve Huston <shuston@riverace.com> * configure.ac: Added check for diff --git a/ace/OS_NS_math.inl b/ace/OS_NS_math.inl index 51db6c44966..6a55a57480a 100644 --- a/ace/OS_NS_math.inl +++ b/ace/OS_NS_math.inl @@ -1,20 +1,24 @@ // -*- C++ -*- // $Id$ -ACE_INLINE double -ACE_OS::floor (double x) -{ - // This method computes the largest integral value not greater than x. - return double (static_cast<long> (x)); -} +namespace ACE_OS { -ACE_INLINE double -ACE_OS::ceil (double x) -{ - // This method computes the smallest integral value not less than x. - const double floor = ACE_OS::floor (x); - if (floor == x) - return floor; - else - return floor + 1; -} + ACE_INLINE double + floor (double x) + { + // This method computes the largest integral value not greater than x. + return double (static_cast<long> (x)); + } + + ACE_INLINE double + ceil (double x) + { + // This method computes the smallest integral value not less than x. + const double floor = ACE_OS::floor (x); + if (floor == x) + return floor; + else + return floor + 1; + } + +} // ACE_OS namespace diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl index 28c44bc22f9..ddc25a35042 100644 --- a/ace/OS_NS_unistd.inl +++ b/ace/OS_NS_unistd.inl @@ -184,8 +184,6 @@ ACE_OS::rmdir (const char *path) return (int) result; -#elif defined (ACE_HAS_NONCONST_RMDIR) - ACE_OSCALL_RETURN (::rmdir (const_cast <char *> (path)), int, -1); #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) ACE_OSCALL_RETURN (::_rmdir ((char *) path), int, -1); #elif defined (ACE_HAS_WINCE) diff --git a/ace/README b/ace/README index 527ecb14e2a..c984dab2dea 100644 --- a/ace/README +++ b/ace/README @@ -407,8 +407,6 @@ ACE_HAS_NONCONST_CHDIR Platform uses non-const char * in call to chdir ACE_HAS_NONCONST_OPENDIR Platform uses non-const char * in call to opendir -ACE_HAS_NONCONST_RMDIR Platform uses non-const char * - in call to rmdir ACE_HAS_NONCONST_UNLINK Platform uses non-const char * in call to unlink ACE_HAS_NONCONST_GETBY Platform uses non-const char * diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index 2a69c3e7e2f..4a2b0383737 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -108,7 +108,6 @@ #define ACE_HAS_NONCONST_SWAB #define ACE_HAS_NONCONST_READV #define ACE_HAS_NONCONST_CHDIR -#define ACE_HAS_NONCONST_RMDIR #define ACE_HAS_NONCONST_UNLINK #define ACE_HAS_NONCONST_OPENDIR #define ACE_LACKS_UNIX_SYSLOG |