archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 00:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

merge revision(s) 63571,63572: [Backport #14816]

Browse source 
`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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-07-30 13:57:35 +00:00
parent 7367d5db54
commit b6ab48d8b1
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/ruby/missing.h
View file

@ -162,6 +162,8 @@ RUBY_EXTERN const union bytesequence4_or_float rb_nan;
# include <ieeefp.h> # include <ieeefp.h>
# endif # endif
# define isinf(x) (!finite(x) && !isnan(x)) # define isinf(x) (!finite(x) && !isnan(x))
# elif defined(__cplusplus) && __cplusplus >= 201103L
# include <cmath> // it must include constexpr bool isinf(double);
# else # else
RUBY_EXTERN int isinf(double); RUBY_EXTERN int isinf(double);
# endif # endif
@ -170,7 +172,11 @@ RUBY_EXTERN int isinf(double);
#ifndef isnan #ifndef isnan
# ifndef HAVE_ISNAN # ifndef HAVE_ISNAN
# if defined(__cplusplus) && __cplusplus >= 201103L
# include <cmath> // it must include constexpr bool isnan(double);
# else
RUBY_EXTERN int isnan(double); RUBY_EXTERN int isnan(double);
# endif
# endif # endif
#endif #endif

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.5" #define RUBY_VERSION "2.4.5"
#define RUBY_RELEASE_DATE "2018-07-30" #define RUBY_RELEASE_DATE "2018-07-30"
#define RUBY_PATCHLEVEL 306 #define RUBY_PATCHLEVEL 307
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7