comparison DEPENDENCIES/generic/include/boost/cstdint.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
comparison
equal deleted inserted replaced
100:793467b5e61c 101:c530137014c0
138 using ::intmax_t; 138 using ::intmax_t;
139 using ::uintmax_t; 139 using ::uintmax_t;
140 140
141 } // namespace boost 141 } // namespace boost
142 142
143 #elif defined(__FreeBSD__) && (__FreeBSD__ <= 4) || defined(__osf__) || defined(__VMS) 143 #elif defined(__FreeBSD__) && (__FreeBSD__ <= 4) || defined(__osf__) || defined(__VMS) || defined(__SOLARIS9__) || defined(__NetBSD__)
144 // FreeBSD and Tru64 have an <inttypes.h> that contains much of what we need. 144 // FreeBSD and Tru64 have an <inttypes.h> that contains much of what we need.
145 # include <inttypes.h> 145 # include <inttypes.h>
146 146
147 namespace boost { 147 namespace boost {
148 148
372 372
373 #if (defined(BOOST_WINDOWS) && !defined(_WIN32_WCE)) \ 373 #if (defined(BOOST_WINDOWS) && !defined(_WIN32_WCE)) \
374 || (defined(_XOPEN_UNIX) && (_XOPEN_UNIX+0 > 0) && !defined(__UCLIBC__)) \ 374 || (defined(_XOPEN_UNIX) && (_XOPEN_UNIX+0 > 0) && !defined(__UCLIBC__)) \
375 || defined(__CYGWIN__) \ 375 || defined(__CYGWIN__) \
376 || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ 376 || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
377 || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) 377 || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun)
378 378
379 namespace boost { 379 namespace boost {
380 using ::intptr_t; 380 using ::intptr_t;
381 using ::uintptr_t; 381 using ::uintptr_t;
382 } 382 }
490 #endif 490 #endif
491 491
492 // 64-bit types + intmax_t and uintmax_t ----------------------------------// 492 // 64-bit types + intmax_t and uintmax_t ----------------------------------//
493 #ifndef INT64_C 493 #ifndef INT64_C
494 # if defined(BOOST_HAS_LONG_LONG) && \ 494 # if defined(BOOST_HAS_LONG_LONG) && \
495 (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX) || defined(_LLONG_MAX)) 495 (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX) || defined(_ULLONG_MAX) || defined(_LLONG_MAX))
496 496
497 # if defined(__hpux) 497 # if defined(__hpux)
498 // HP-UX's value of ULONG_LONG_MAX is unusable in preprocessor expressions 498 // HP-UX's value of ULONG_LONG_MAX is unusable in preprocessor expressions
499 # define INT64_C(value) value##LL 499 # define INT64_C(value) value##LL
500 # define UINT64_C(value) value##uLL 500 # define UINT64_C(value) value##uLL
501 # elif (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615ULL) || \ 501 # elif (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615ULL) || \
502 (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615ULL) || \ 502 (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615ULL) || \
503 (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615ULL) || \ 503 (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615ULL) || \
504 (defined(_LLONG_MAX) && _LLONG_MAX == 18446744073709551615ULL) 504 (defined(_ULLONG_MAX) && _ULLONG_MAX == 18446744073709551615ULL) || \
505 (defined(_LLONG_MAX) && _LLONG_MAX == 9223372036854775807LL)
505 506
506 # define INT64_C(value) value##LL 507 # define INT64_C(value) value##LL
507 # define UINT64_C(value) value##uLL 508 # define UINT64_C(value) value##uLL
508 # else 509 # else
509 # error defaults not correct; you must hand modify boost/cstdint.hpp 510 # error defaults not correct; you must hand modify boost/cstdint.hpp