From a996cfd711451e4b5b34d690b9dea3095a68a98d Mon Sep 17 00:00:00 2001 From: "Brian W. Mulligan" Date: Wed, 20 May 2020 12:46:32 -0500 Subject: [PATCH] remove environment module creation from Makefile.am; remove function causing weird compile error in xextprec.h --- Makefile.am | 14 +++++++------- xmath/include/xextprec.h | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe71658..1d16e3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,13 +6,13 @@ SUBDIRS = xstdlib xio xmath xastro xcpp xflash xtime testing xtools #everything below here creates a module for xlibs in the user's privatemodules directory (if it exists) or in the data directory # it will create a .lua module for lmod, and a regular module file for env. modules. # the module will be created in a directory called ${PACKAGE_NAME} and have a filename of ${PACKAGE_VERSION}. This is the format used by modules for versioning. -if INSTALLMOD -if HAVEENVMOD -modfile_DATA = ${PACKAGE_VERSION} -else -modfile_DATA = ${PACKAGE_VERSION}.lua -endif -endif +#if INSTALLMOD +#if HAVEENVMOD +#modfile_DATA = ${PACKAGE_VERSION} +#else +#modfile_DATA = ${PACKAGE_VERSION}.lua +#endif +#endif #MODFILEINSTPATH=`echo ${modfiledir}"/"${PACKAGE_NAME}` # diff --git a/xmath/include/xextprec.h b/xmath/include/xextprec.h index c52d1bf..66296e3 100644 --- a/xmath/include/xextprec.h +++ b/xmath/include/xextprec.h @@ -844,13 +844,13 @@ class expdouble inline bool isnormal(void) const { //pbin(m_nMantissa); - return (iszero() || (isfinite() && ((m_nMantissa & highbit64) == highbit64))); + return (iszero() || (isfinite() && ((m_nMantissa & highbit64) != 0))); } - inline bool issubnormal(void) const - { +// inline bool issubnormal(void) const +// { //pbin(m_nMantissa); - return (iszero() || (isfinite() && ((m_nMantissa & highbit64) != highbit64))); - } +// return (iszero() || (isfinite() && ((m_nMantissa & highbit64) == 0))); +// } inline bool signbit(void) const { return ((m_nExponent & highbit64) == highbit64);