Mercurial > octave
changeset 21354:06d15e4e611a
move public data type macros to octave-config.h
* configure.ac: Define OCTAVE_HAVE_LONG_LONG_INT,
OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT, and
OCTAVE_HAVE_OVERLOAD_CHAR_INT8_TYPES.
* mk-oct-config-h.sh: Extract them from config.h.
* oct-stream.cc, ov.cc, ov.h, Array-i.cc, data-conv.cc,
oct-inttypes.h, acinclude.m4: Use new macro names.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 25 Feb 2016 17:34:14 -0500 |
parents | e4fc19d8c6c3 |
children | 28d9bce20aa7 |
files | build-aux/mk-octave-config-h.sh configure.ac libinterp/corefcn/oct-stream.cc libinterp/octave-value/ov.cc libinterp/octave-value/ov.h liboctave/array/Array-i.cc liboctave/util/data-conv.cc liboctave/util/oct-inttypes.h m4/acinclude.m4 |
diffstat | 9 files changed, 26 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/mk-octave-config-h.sh Thu Feb 25 16:15:04 2016 -0500 +++ b/build-aux/mk-octave-config-h.sh Thu Feb 25 17:34:14 2016 -0500 @@ -156,6 +156,9 @@ grep "#\(undef\|define\) OCTAVE_ENABLE_OPENMP" $config_h_file grep "#\(undef\|define\) OCTAVE_HAVE_FAST_INT_OPS" $config_h_file +grep "#\(undef\|define\) OCTAVE_HAVE_LONG_LONG_INT" $config_h_file +grep "#\(undef\|define\) OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT" $config_h_file +grep "#\(undef\|define\) OCTAVE_HAVE_OVERLOAD_CHAR_INT8_TYPES" $config_h_file if grep "#undef HAVE_DEV_T" $config_h_file > /dev/null; then cat << EOF
--- a/configure.ac Thu Feb 25 16:15:04 2016 -0500 +++ b/configure.ac Thu Feb 25 17:34:14 2016 -0500 @@ -2219,9 +2219,20 @@ AC_TYPE_UID_T AC_TYPE_UINT64_T AC_CHECK_TYPES([dev_t, ino_t]) -AC_CHECK_TYPES([long long int, unsigned long long int]) AC_CHECK_TYPES([ptrdiff_t]) +AC_CHECK_TYPES([long long int]) +if test "x$ac_cv_type_long_long_int" = xyes; then + AC_DEFINE(OCTAVE_HAVE_LONG_LONG_INT, 1, + [Define to 1 if the system has the type 'long long int'.]) +fi + +AC_CHECK_TYPES([unsigned long long int]) +if test "x$ac_cv_type_unsigned_long_long_int" = xyes; then + AC_DEFINE(OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT, 1, + [Define to 1 if the system has the type 'unsigned long long int'.]) +fi + ## How big are ints and how are they oriented? ## These could probably be eliminated in favor of run-time checks. @@ -2255,7 +2266,7 @@ AC_LANG_POP(C++) ]) if test $octave_cv_overload_char_int8_t = yes; then - AC_DEFINE(HAVE_OVERLOAD_CHAR_INT8_TYPES, 1, + AC_DEFINE(OCTAVE_HAVE_OVERLOAD_CHAR_INT8_TYPES, 1, [Define to 1 if C++ allows overload of char, int8_t, and uint8_t types.]) fi
--- a/libinterp/corefcn/oct-stream.cc Thu Feb 25 16:15:04 2016 -0500 +++ b/libinterp/corefcn/oct-stream.cc Thu Feb 25 17:34:14 2016 -0500 @@ -3860,7 +3860,7 @@ INSTANTIATE_WRITE (int64_t); INSTANTIATE_WRITE (uint64_t); INSTANTIATE_WRITE (bool); -#if defined (HAVE_OVERLOAD_CHAR_INT8_TYPES) +#if defined (OCTAVE_HAVE_OVERLOAD_CHAR_INT8_TYPES) INSTANTIATE_WRITE (char); #endif INSTANTIATE_WRITE (float);
--- a/libinterp/octave-value/ov.cc Thu Feb 25 16:15:04 2016 -0500 +++ b/libinterp/octave-value/ov.cc Thu Feb 25 17:34:14 2016 -0500 @@ -496,14 +496,14 @@ { } -#if defined (HAVE_LONG_LONG_INT) +#if defined (OCTAVE_HAVE_LONG_LONG_INT) octave_value::octave_value (long long int i) : rep (new octave_scalar (i)) { } #endif -#if defined (HAVE_UNSIGNED_LONG_LONG_INT) +#if defined (OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT) octave_value::octave_value (unsigned long long int i) : rep (new octave_scalar (i)) {
--- a/libinterp/octave-value/ov.h Thu Feb 25 16:15:04 2016 -0500 +++ b/libinterp/octave-value/ov.h Thu Feb 25 17:34:14 2016 -0500 @@ -185,10 +185,10 @@ // 64-bit ino_t, etc, and hope that those values are never actually larger // than can be represented exactly in a double. -#if defined (HAVE_LONG_LONG_INT) +#if defined (OCTAVE_HAVE_LONG_LONG_INT) octave_value (long long int i); #endif -#if defined (HAVE_UNSIGNED_LONG_LONG_INT) +#if defined (OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT) octave_value (unsigned long long int i); #endif
--- a/liboctave/array/Array-i.cc Thu Feb 25 16:15:04 2016 -0500 +++ b/liboctave/array/Array-i.cc Thu Feb 25 17:34:14 2016 -0500 @@ -37,13 +37,13 @@ template class OCTAVE_API octave_sort<int>; template class OCTAVE_API octave_sort<long>; -#if defined (HAVE_LONG_LONG_INT) +#if defined (OCTAVE_HAVE_LONG_LONG_INT) template class OCTAVE_API octave_sort<long long>; #endif INSTANTIATE_ARRAY (int, OCTAVE_API); INSTANTIATE_ARRAY (long, OCTAVE_API); -#if defined (HAVE_LONG_LONG_INT) +#if defined (OCTAVE_HAVE_LONG_LONG_INT) INSTANTIATE_ARRAY (long long, OCTAVE_API); #endif
--- a/liboctave/util/data-conv.cc Thu Feb 25 16:15:04 2016 -0500 +++ b/liboctave/util/data-conv.cc Thu Feb 25 17:34:14 2016 -0500 @@ -37,7 +37,7 @@ #include "lo-ieee.h" #include "oct-locbuf.h" -#if defined HAVE_LONG_LONG_INT +#if defined (OCTAVE_HAVE_LONG_LONG_INT) # define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ do \ { \
--- a/liboctave/util/oct-inttypes.h Thu Feb 25 16:15:04 2016 -0500 +++ b/liboctave/util/oct-inttypes.h Thu Feb 25 17:34:14 2016 -0500 @@ -845,7 +845,7 @@ octave_int (T i) : ival (i) { } -#if defined (HAVE_OVERLOAD_CHAR_INT8_TYPES) +#if defined (OCTAVE_HAVE_OVERLOAD_CHAR_INT8_TYPES) // Always treat characters as unsigned. octave_int (char c) : ival (octave_int_base<T>::truncate_int (static_cast<unsigned char> (c)))
--- a/m4/acinclude.m4 Thu Feb 25 16:15:04 2016 -0500 +++ b/m4/acinclude.m4 Thu Feb 25 17:34:14 2016 -0500 @@ -1559,7 +1559,7 @@ DO_TEST(short) DO_TEST(int) DO_TEST(long) - #if (defined(HAVE_LONG_LONG_INT) && defined(HAVE_UNSIGNED_LONG_LONG_INT)) + #if (defined(OCTAVE_HAVE_LONG_LONG_INT) && defined(OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT)) DO_TEST(long long) #endif ]])],