From: Date: July 6 2005 10:51am Subject: bk commit into 4.1 tree (ramil:1.2328) BUG#11544 List-Archive: http://lists.mysql.com/internals/26703 X-Bug: 11544 Message-Id: <200507060851.j668pwE5060260@gw.mysql.r18.ru> Below is the list of changes that have just been committed into a local 4.1 repository of ram. When ram does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.2328 05/07/06 13:51:53 ramil@stripped +1 -0 a fix (bug #11544: Use of missing rint() function on QNX). include/my_global.h 1.96 05/07/06 13:37:08 ramil@stripped +5 -0 a fix (bug #11544: Use of missing rint() function on QNX). We have to explicitly specify std:: namespace to use rint() and isnan() functions in C++ scope on QNX due to an error in the /usr/include/math.h # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: ramil # Host: gw.mysql.r18.ru # Root: /usr/home/ram/work/mysql-4.1 --- 1.95/include/my_global.h 2005-06-24 12:51:07 +05:00 +++ 1.96/include/my_global.h 2005-07-06 13:37:08 +05:00 @@ -318,6 +318,11 @@ #undef HAVE_FINITE #undef LONGLONG_MIN /* These get wrongly defined in QNX 6.2 */ #undef LONGLONG_MAX /* standard system library 'limits.h' */ +#ifdef __cplusplus +#define HAVE_RINT /* rint() and isnan() functions are not */ +#define rint(a) std::rint(a) /* visible in C++ scope due to an error */ +#define isnan(a) std::isnan(a) /* in the usr/include/math.h on QNX */ +#endif #endif /* We can not live without the following defines */