From 5485adacb9b407d8cbcf6ffbb6e41a6690f9025b Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Fri, 15 Apr 2022 11:39:50 -0700 Subject: [PATCH] make epicsNAN and epicsINF constants really constant --- modules/libcom/src/osi/epicsMath.cpp | 4 ++-- modules/libcom/src/osi/os/Darwin/epicsMath.h | 4 ++-- modules/libcom/src/osi/os/RTEMS-score/epicsMath.h | 4 ++-- modules/libcom/src/osi/os/WIN32/epicsMath.h | 4 ++-- modules/libcom/src/osi/os/iOS/epicsMath.h | 4 ++-- modules/libcom/src/osi/os/posix/epicsMath.h | 4 ++-- modules/libcom/src/osi/os/solaris/epicsMath.h | 4 ++-- modules/libcom/src/osi/os/vxWorks/epicsMath.h | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/libcom/src/osi/epicsMath.cpp b/modules/libcom/src/osi/epicsMath.cpp index 7835420c6..2e3f22bbe 100644 --- a/modules/libcom/src/osi/epicsMath.cpp +++ b/modules/libcom/src/osi/epicsMath.cpp @@ -33,8 +33,8 @@ static float makeINF ( void ) #endif extern "C" { -float epicsNAN = NAN; -float epicsINF = INFINITY; +const float epicsNAN = NAN; +const float epicsINF = INFINITY; } #ifdef _MSC_VER diff --git a/modules/libcom/src/osi/os/Darwin/epicsMath.h b/modules/libcom/src/osi/os/Darwin/epicsMath.h index 361884a67..75af13bbe 100644 --- a/modules/libcom/src/osi/os/Darwin/epicsMath.h +++ b/modules/libcom/src/osi/os/Darwin/epicsMath.h @@ -20,8 +20,8 @@ extern "C" { #endif -LIBCOM_API extern float epicsNAN; -LIBCOM_API extern float epicsINF; +LIBCOM_API extern const float epicsNAN; +LIBCOM_API extern const float epicsINF; #ifdef __cplusplus } diff --git a/modules/libcom/src/osi/os/RTEMS-score/epicsMath.h b/modules/libcom/src/osi/os/RTEMS-score/epicsMath.h index 4f18485d9..8b7d49ac2 100644 --- a/modules/libcom/src/osi/os/RTEMS-score/epicsMath.h +++ b/modules/libcom/src/osi/os/RTEMS-score/epicsMath.h @@ -19,8 +19,8 @@ extern "C" { #endif -LIBCOM_API extern float epicsNAN; -LIBCOM_API extern float epicsINF; +LIBCOM_API extern const float epicsNAN; +LIBCOM_API extern const float epicsINF; #ifdef __cplusplus } diff --git a/modules/libcom/src/osi/os/WIN32/epicsMath.h b/modules/libcom/src/osi/os/WIN32/epicsMath.h index 133b02f00..883cd9b0b 100644 --- a/modules/libcom/src/osi/os/WIN32/epicsMath.h +++ b/modules/libcom/src/osi/os/WIN32/epicsMath.h @@ -31,8 +31,8 @@ extern "C" { #endif -LIBCOM_API extern float epicsNAN; -LIBCOM_API extern float epicsINF; +LIBCOM_API extern const float epicsNAN; +LIBCOM_API extern const float epicsINF; #ifdef __cplusplus } diff --git a/modules/libcom/src/osi/os/iOS/epicsMath.h b/modules/libcom/src/osi/os/iOS/epicsMath.h index 9d8852cb6..71c308d77 100644 --- a/modules/libcom/src/osi/os/iOS/epicsMath.h +++ b/modules/libcom/src/osi/os/iOS/epicsMath.h @@ -18,8 +18,8 @@ extern "C" { #endif -LIBCOM_API extern float epicsNAN; -LIBCOM_API extern float epicsINF; +LIBCOM_API extern const float epicsNAN; +LIBCOM_API extern const float epicsINF; #ifdef __cplusplus } diff --git a/modules/libcom/src/osi/os/posix/epicsMath.h b/modules/libcom/src/osi/os/posix/epicsMath.h index 7b5810437..9a45d3556 100644 --- a/modules/libcom/src/osi/os/posix/epicsMath.h +++ b/modules/libcom/src/osi/os/posix/epicsMath.h @@ -35,8 +35,8 @@ extern "C" { # define finite(x) isfinite((double)(x)) #endif -LIBCOM_API extern float epicsNAN; -LIBCOM_API extern float epicsINF; +LIBCOM_API extern const float epicsNAN; +LIBCOM_API extern const float epicsINF; #ifdef __cplusplus } diff --git a/modules/libcom/src/osi/os/solaris/epicsMath.h b/modules/libcom/src/osi/os/solaris/epicsMath.h index cd52b158b..fde697842 100644 --- a/modules/libcom/src/osi/os/solaris/epicsMath.h +++ b/modules/libcom/src/osi/os/solaris/epicsMath.h @@ -26,8 +26,8 @@ extern "C" { #endif -LIBCOM_API extern float epicsNAN; -LIBCOM_API extern float epicsINF; +LIBCOM_API extern const float epicsNAN; +LIBCOM_API extern const float epicsINF; #ifdef __cplusplus } diff --git a/modules/libcom/src/osi/os/vxWorks/epicsMath.h b/modules/libcom/src/osi/os/vxWorks/epicsMath.h index 83453558f..97e4a8d29 100644 --- a/modules/libcom/src/osi/os/vxWorks/epicsMath.h +++ b/modules/libcom/src/osi/os/vxWorks/epicsMath.h @@ -30,8 +30,8 @@ extern "C" { #endif -LIBCOM_API extern float epicsNAN; -LIBCOM_API extern float epicsINF; +LIBCOM_API extern const float epicsNAN; +LIBCOM_API extern const float epicsINF; #ifdef __cplusplus }