Skip to content

Commit

Permalink
Merge pull request #60 from mirjalali/master
Browse files Browse the repository at this point in the history
resolved a warning & a compile error on gcc 4.4 and before
  • Loading branch information
MikeMirzayanov committed Dec 28, 2017
2 parents dc36dcb + 996cc0b commit cfa2ec7
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions testlib.h
Expand Up @@ -331,15 +331,15 @@ static bool __testlib_isNaN(double r)
std::memcpy((void*)&llr1, (void*)&ra, sizeof(double));
ra = -ra;
std::memcpy((void*)&llr2, (void*)&ra, sizeof(double));
long long llnan = 0xFFF8000000000000;
long long llnan = 0xFFF8000000000000LL;
return __testlib_prelimIsNaN(r) || llnan == llr1 || llnan == llr2;
}

static double __testlib_nan()
{
__TESTLIB_STATIC_ASSERT(sizeof(double) == sizeof(long long));
#ifndef NAN
long long llnan = 0xFFF8000000000000;
long long llnan = 0xFFF8000000000000LL;
double nan;
std::memcpy(&nan, &llnan, sizeof(double));
return nan;
Expand Down Expand Up @@ -3661,10 +3661,14 @@ void registerGen(int argc, char* argv[])
}
#else
#ifdef __GNUC__
#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 4))
__attribute__ ((deprecated("Use registerGen(argc, argv, 0) or registerGen(argc, argv, 1)."
" The third parameter stands for the random generator version."
" If you are trying to compile old generator use macro -DUSE_RND_AS_BEFORE_087 or registerGen(argc, argv, 0)."
" Version 1 has been released on Spring, 2013. Use it to write new generators.")))
#else
__attribute__ ((deprecated))
#endif
#endif
#ifdef _MSC_VER
__declspec(deprecated("Use registerGen(argc, argv, 0) or registerGen(argc, argv, 1)."
Expand Down

0 comments on commit cfa2ec7

Please sign in to comment.