nagachika	2018-08-18 13:18:32 +0900 (Sat, 18 Aug 2018)

  New Revision: 64434

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64434

  Log:
    merge revision(s) 63571,63572: [Backport #14816]
    
    `int isnan(double)` is a POSIXism
    
    - `isnan` is something relatively new.  We need to provide one for
      those systems without it.  However:
    - X/Open defines `int isnan(double)`. Note the `int`.
    - C99 defines `isnan(x)` to be a macro.
    - C++11 nukes them all, undefines all the "masking macro"s, and
      defines its own `bool isnan(double)`.  Note the `bool`.
    - In C++, `int isnan(double)` and `bool isnan(double)` are
      incompatible.
    - So the mess.
    
    [Bug #14816][ruby-core:87364]
    further reading: https://developers.redhat.com/blog/2016/02/29/why-cstdlib-is-more-complicated-than-you-might-think/
    
    
    include/ruby/missing.h: defined(__cplusplus) before using __cplusplus
    
    * include/ruby/missing.h (isinf, isnan): For non-C++ programs,
      defined(__cplusplus) may be needed before using __cplusplus.
      [Bug #14816]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/include/ruby/missing.h
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 64433)
+++ ruby_2_5/version.h	(revision 64434)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.2"
 #define RUBY_RELEASE_DATE "2018-08-18"
-#define RUBY_PATCHLEVEL 76
+#define RUBY_PATCHLEVEL 77
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_5/include/ruby/missing.h
===================================================================
--- ruby_2_5/include/ruby/missing.h	(revision 64433)
+++ ruby_2_5/include/ruby/missing.h	(revision 64434)
@@ -162,6 +162,8 @@ RUBY_EXTERN const union bytesequence4_or https://github.com/ruby/ruby/blob/trunk/ruby_2_5/include/ruby/missing.h#L162
 #    include <ieeefp.h>
 #    endif
 #  define isinf(x) (!finite(x) && !isnan(x))
+#  elif defined(__cplusplus) && __cplusplus >= 201103L
+#    include <cmath> // it must include constexpr bool isinf(double);
 #  else
 RUBY_EXTERN int isinf(double);
 #  endif
@@ -170,7 +172,11 @@ RUBY_EXTERN int isinf(double); https://github.com/ruby/ruby/blob/trunk/ruby_2_5/include/ruby/missing.h#L172
 
 #ifndef isnan
 # ifndef HAVE_ISNAN
+#  if defined(__cplusplus) && __cplusplus >= 201103L
+#    include <cmath> // it must include constexpr bool isnan(double);
+#  else
 RUBY_EXTERN int isnan(double);
+#  endif
 # endif
 #endif
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 64433)
+++ ruby_2_5	(revision 64434)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r63571-63572

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/