Merge branch 'development' of https://github.com/ETLCPP/etl into development

This commit is contained in:
John Wellbelove 2024-04-11 11:38:58 +01:00
commit a2f40effa4
2 changed files with 6 additions and 6 deletions

View File

@ -80,19 +80,19 @@ SOFTWARE.
#if defined(ETL_NO_CPP_NAN_SUPPORT)
#if defined(NAN)
#include "etl/private/diagnostic_useless_cast_push.h"
#include "private/diagnostic_useless_cast_push.h"
#define ETL_NANF NAN
#define ETL_NAN static_cast<double>(NAN)
#define ETL_NANL static_cast<long double>(NAN)
#define ETL_HAS_NAN true
#include "etl/private/diagnostic_pop.h"
#include "private/diagnostic_pop.h"
#else
#include "etl/private/diagnostic_useless_cast_push.h"
#include "private/diagnostic_useless_cast_push.h"
#define ETL_NANF HUGE_VALF
#define ETL_NAN HUGE_VAL
#define ETL_NANL HUGE_VALL
#define ETL_HAS_NAN false
#include "etl/private/diagnostic_pop.h"
#include "private/diagnostic_pop.h"
#endif
#else
#define ETL_NANF nanf("")

View File

@ -462,12 +462,12 @@ namespace etl
random_pcg()
{
#include "etl/private/diagnostic_useless_cast_push.h"
#include "private/diagnostic_useless_cast_push.h"
// An attempt to come up with a unique non-zero seed,
// based on the address of the instance.
uintptr_t n = reinterpret_cast<uintptr_t>(this);
value = static_cast<uint64_t>(n);
#include "etl/private/diagnostic_pop.h"
#include "private/diagnostic_pop.h"
}
//***************************************************************************