epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge branch '3.15' into 7.0

Browse Source 
* 3.15:
  minor epicsTimerTest
  epicsTimerTest loosen test threshold
  debug epicsTimerTest
  posix/epicsMath.h
  Revert "libcom: fix colliding isnan/isinf between C99 and C++0x for gcc-4"
  Revert "libcom: properly declare isnan() in C++ code"
  travis-ci /etc/hosts workaround
  redo travis-ci with matrix
  epicsSockResolveTest add detail
  libcom: properly declare isnan() in C++ code
  libcom: fix colliding isnan/isinf between C99 and C++0x for gcc-4
  libcom: import some C99 math (isnan etc.) into global namespace

# Conflicts:
#	.travis.yml
#	ci/travis-prepare.sh
This commit is contained in:
Michael Davidsaver
2019-12-16 14:50:49 -08:00
parent f6d8a1ab6c feb938fae2
commit 189060c14f
5 changed files with 91 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/libcom/src/osi/os/posix/epicsMath.h
View File

@@ -14,6 +14,16 @@
#include <shareLib.h>
#ifdef __cplusplus
#if __cplusplus>=201103L
#include <cmath>
using std::isfinite;
using std::isinf;
using std::isnan;
using std::isnormal;
#endif
extern "C" {
#endif

7
modules/libcom/test/epicsSockResolveTest.c
View File

@@ -75,8 +75,11 @@ MAIN(epicsSockResolveTest)
testSkip(2, " aToIPAddr() failed");
}
else {
testOk(addr.sin_addr.s_addr == htonl(okdata[i].IP), " IP correct");
testOk(addr.sin_port == htons(okdata[i].port), " Port correct");
testOk(addr.sin_addr.s_addr == htonl(okdata[i].IP),
" IP correct 0x%08x == 0x%08x", (unsigned)ntohl(addr.sin_addr.s_addr),
(unsigned)okdata[i].IP);
testOk(addr.sin_port == htons(okdata[i].port), " Port correct %u == %u",
ntohs(addr.sin_port), okdata[i].port);
}
}