From a1865a712d3d868914a2defbf514389c7d4b5a55 Mon Sep 17 00:00:00 2001 From: Steven Watanabe Date: Mon, 17 Jan 2011 04:51:54 +0000 Subject: [PATCH] Revert addition of BOOST_NIX, etc and everything tied to it. ([66696], [66783], [66804], [66833], and [66834]) [SVN r68201] --- .../boost_config/boost_macro_reference.html | 90 ------------------- doc/html/index.html | 4 +- doc/macro_reference.qbk | 30 ++----- include/boost/config/compiler/borland.hpp | 3 - include/boost/config/compiler/comeau.hpp | 2 - include/boost/config/compiler/gcc.hpp | 1 + include/boost/config/compiler/metrowerks.hpp | 2 - include/boost/config/compiler/sunpro_cc.hpp | 4 - include/boost/config/compiler/visualc.hpp | 3 - include/boost/config/platform/aix.hpp | 8 -- include/boost/config/platform/amigaos.hpp | 3 - include/boost/config/platform/beos.hpp | 8 -- include/boost/config/platform/bsd.hpp | 25 ++---- include/boost/config/platform/cygwin.hpp | 66 +++++++------- include/boost/config/platform/hpux.hpp | 8 -- include/boost/config/platform/irix.hpp | 6 -- include/boost/config/platform/linux.hpp | 8 -- include/boost/config/platform/macos.hpp | 6 -- include/boost/config/platform/qnxnto.hpp | 8 -- include/boost/config/platform/solaris.hpp | 6 -- include/boost/config/platform/symbian.hpp | 10 +-- include/boost/config/platform/vxworks.hpp | 6 -- include/boost/config/platform/win32.hpp | 1 + include/boost/config/stdlib/libstdcpp3.hpp | 15 ++-- include/boost/config/stdlib/sgi.hpp | 11 +-- include/boost/config/stdlib/stlport.hpp | 11 +-- include/boost/config/stdlib/vacpp.hpp | 11 +-- include/boost/config/suffix.hpp | 4 - test/boost_no_fenv_h.ipp | 78 ---------------- test/no_fenv_h_fail.cpp | 33 ------- test/no_fenv_h_pass.cpp | 33 ------- 31 files changed, 66 insertions(+), 438 deletions(-) delete mode 100644 test/boost_no_fenv_h.ipp delete mode 100644 test/no_fenv_h_fail.cpp delete mode 100644 test/no_fenv_h_pass.cpp diff --git a/doc/html/boost_config/boost_macro_reference.html b/doc/html/boost_config/boost_macro_reference.html index 1ae8f0f8..7986b6b3 100644 --- a/doc/html/boost_config/boost_macro_reference.html +++ b/doc/html/boost_config/boost_macro_reference.html @@ -3481,96 +3481,6 @@ - -

- BOOST_LINUX -

- - -

- <boost/config.hpp> -

- - -

- Defined if the system kernel is Linux -

- - - - -

- BOOST_NIX -

- - -

- <boost/config.hpp> -

- - -

- Defined if the system is POSIX compliant -

- - - - -

- BOOST_GENETIC_NIX -

- - -

- <boost/config.hpp> -

- - -

- Defined if the system can trace its ancestry to the original AT&T - codebase or designs, but is not certified by the Open Group. This - is the case for modern open-source BSD systems. -

- - - - -

- BOOST_TRADEMARK_NIX -

- - -

- <boost/config.hpp> -

- - -

- Systems certified as POSIX compliant by the Open Group. These systems - can use the UNIX trademark. Most commercially developed *nix systems - fall into this category. -

- - - - -

- BOOST_FUNCTIONAL_NIX -

- - -

- <boost/config.hpp> -

- - -

- Systems which behave in a manner roughly consistent with POSIX - standards. Linux and Minix fall into this category. -

- - -

BOOST_DINKUMWARE_STDLIB diff --git a/doc/html/index.html b/doc/html/index.html index 5c2f3211..caec8875 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -28,7 +28,7 @@

Copyright © 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock

-

+

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

@@ -950,7 +950,7 @@
- +

Last revised: November 25, 2010 at 10:30:55 GMT

Last revised: November 23, 2010 at 03:21:20 GMT
diff --git a/doc/macro_reference.qbk b/doc/macro_reference.qbk index eae6572f..eacbf8e7 100644 --- a/doc/macro_reference.qbk +++ b/doc/macro_reference.qbk @@ -71,11 +71,6 @@ The Platform does not provide `` and ``. [[`BOOST_NO_CWCTYPE`][Platform][ The Platform does not provide `` and ``. ]] -[[`BOOST_NO_FENV_H`][Platform, Standard library][ -The C standard library doesn't provide ``. [@../../../../boost/detail/fenv.hpp -``] should be included instead of `` for maximum -portability on platforms which do provide ``. -]] [[`BOOST_NO_DEPENDENT_NESTED_DERIVATIONS`][Compiler][ The compiler fails to compile a nested class that has a dependent base class: `` @@ -404,6 +399,11 @@ The platform has the POSIX API `sched_yield`. [[`BOOST_HAS_SGI_TYPE_TRAITS`][Compiler, Standard library][ The compiler has native support for SGI style type traits. ]] +[[`BOOST_HAS_FENV_H`][Platform, Standard library][ +The platform has a ``. [@../../../../boost/detail/fenv.hpp +``] should be included instead of `` for maximum +portability. +]] [[`BOOST_HAS_STDINT_H`][Platform][ The platform has a `` ]] @@ -882,26 +882,6 @@ Defined to 1 if the compiler is the Clang compiler. [[`BOOST_WINDOWS`][``][ Defined if the Windows platfrom API is available. ]] -[[`BOOST_LINUX`][``][ -Defined if the system kernel is Linux -]] -[[`BOOST_NIX`][``][ -Defined if the system is POSIX compliant -]] -[[`BOOST_GENETIC_NIX`][``][ -Defined if the system can trace its ancestry to the original AT&T codebase or -designs, but is not certified by the Open Group. This is the case for modern -open-source BSD systems. -]] -[[`BOOST_TRADEMARK_NIX`][``][ -Systems certified as POSIX compliant by the Open Group. These systems can use -the UNIX trademark. Most commercially developed *nix systems fall into this -category. -]] -[[`BOOST_FUNCTIONAL_NIX`][``][ -Systems which behave in a manner roughly consistent with POSIX standards. Linux -and Minix fall into this category. -]] [[`BOOST_DINKUMWARE_STDLIB`][``][ Defined if the dinkumware standard library is in use, takes the same value as the Dinkumware library version macro `_CPPLIB_VER` if defined, otherwise 1. diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp index 2816ab88..a989fd63 100644 --- a/include/boost/config/compiler/borland.hpp +++ b/include/boost/config/compiler/borland.hpp @@ -12,9 +12,6 @@ // // versions check: // we don't support Borland prior to version 5.4: - -#define BOOST_BORLAND __BORLANDC__ - #if __BORLANDC__ < 0x540 # error "Compiler not supported or configured - please reconfigure" #endif diff --git a/include/boost/config/compiler/comeau.hpp b/include/boost/config/compiler/comeau.hpp index c2cedb17..278222dc 100644 --- a/include/boost/config/compiler/comeau.hpp +++ b/include/boost/config/compiler/comeau.hpp @@ -14,8 +14,6 @@ #include "boost/config/compiler/common_edg.hpp" -#define BOOST_COMO __COMO_VERSION__ - #if (__COMO_VERSION__ <= 4245) # if defined(_MSC_VER) && _MSC_VER <= 1300 diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp index 7ce7fe6b..f633647d 100644 --- a/include/boost/config/compiler/gcc.hpp +++ b/include/boost/config/compiler/gcc.hpp @@ -89,6 +89,7 @@ # define BOOST_NO_EXCEPTIONS #endif + // // Threading support: Turn this on unconditionally here (except for // those platforms where we can know for sure). It will get turned off again diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp index 81854a0f..21083b7a 100644 --- a/include/boost/config/compiler/metrowerks.hpp +++ b/include/boost/config/compiler/metrowerks.hpp @@ -12,8 +12,6 @@ // Metrowerks C++ compiler setup: -#define BOOST_MWERKS __MWERKS__ - // locale support is disabled when linking with the dynamic runtime # ifdef _MSL_NO_LOCALE # define BOOST_NO_STD_LOCALE diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp index e718dbb6..85fa4625 100644 --- a/include/boost/config/compiler/sunpro_cc.hpp +++ b/include/boost/config/compiler/sunpro_cc.hpp @@ -11,10 +11,6 @@ // Sun C++ compiler setup: -// Macro identifying the Sun compiler - -#define BOOST_SUNCC __SUNPRO_CC - # if __SUNPRO_CC <= 0x500 # define BOOST_NO_MEMBER_TEMPLATES # define BOOST_NO_FUNCTION_TEMPLATE_ORDERING diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index 38789367..15b58b38 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -37,9 +37,6 @@ // #endif -/// Visual Studio has no fenv.h -#define BOOST_NO_FENV_H - #if (_MSC_VER <= 1300) // 1300 == VC++ 7.0 # if !defined(_MSC_EXTENSIONS) && !defined(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS) // VC7 bug with /Za diff --git a/include/boost/config/platform/aix.hpp b/include/boost/config/platform/aix.hpp index ec22a42f..894ef42c 100644 --- a/include/boost/config/platform/aix.hpp +++ b/include/boost/config/platform/aix.hpp @@ -1,5 +1,4 @@ // (C) Copyright John Maddock 2001 - 2002. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,13 +9,6 @@ #define BOOST_PLATFORM "IBM Aix" -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -#define BOOST_TRADEMARK_NIX 1 -//#define BOOST_FUNCTIONAL_NIX 1 - -#define BOOST_AIX 1 - #define BOOST_HAS_UNISTD_H #define BOOST_HAS_NL_TYPES_H #define BOOST_HAS_NANOSLEEP diff --git a/include/boost/config/platform/amigaos.hpp b/include/boost/config/platform/amigaos.hpp index a1f12f6d..34bcf412 100644 --- a/include/boost/config/platform/amigaos.hpp +++ b/include/boost/config/platform/amigaos.hpp @@ -1,5 +1,4 @@ // (C) Copyright John Maddock 2002. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -8,8 +7,6 @@ #define BOOST_PLATFORM "AmigaOS" -#define BOOST_AMIGA 1 - #define BOOST_DISABLE_THREADS #define BOOST_NO_CWCHAR #define BOOST_NO_STD_WSTRING diff --git a/include/boost/config/platform/beos.hpp b/include/boost/config/platform/beos.hpp index cda00164..48c3d8dc 100644 --- a/include/boost/config/platform/beos.hpp +++ b/include/boost/config/platform/beos.hpp @@ -1,5 +1,4 @@ // (C) Copyright John Maddock 2001. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,13 +9,6 @@ #define BOOST_PLATFORM "BeOS" -#define BOOST_BEOS 1 - -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -//#define BOOST_TRADEMARK_NIX 1 -#define BOOST_FUNCTIONAL_NIX 1 - #define BOOST_NO_CWCHAR #define BOOST_NO_CWCTYPE #define BOOST_HAS_UNISTD_H diff --git a/include/boost/config/platform/bsd.hpp b/include/boost/config/platform/bsd.hpp index 9720c777..a0142978 100644 --- a/include/boost/config/platform/bsd.hpp +++ b/include/boost/config/platform/bsd.hpp @@ -1,7 +1,6 @@ // (C) Copyright John Maddock 2001 - 2003. // (C) Copyright Darin Adler 2001. // (C) Copyright Douglas Gregor 2002. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,30 +9,18 @@ // generic BSD config options: -#if !defined(__FreeBSD__) && \ - !defined(__NetBSD__) && \ - !defined(__OpenBSD__) && \ - !defined(__DragonFly__) - #error "This platform is not BSD" +#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) +#error "This platform is not BSD" #endif -#define BOOST_NIX 1 -#define BOOST_GENETIC_NIX 1 -//#define BOOST_TRADEMARK_NIX 1 -//#define BOOST_FUNCTIONAL_NIX 1 - #ifdef __FreeBSD__ - #define BOOST_PLATFORM "FreeBSD " BOOST_STRINGIZE(__FreeBSD__) - #define BOOST_FREEBSD __FreeBSD__ +#define BOOST_PLATFORM "FreeBSD " BOOST_STRINGIZE(__FreeBSD__) #elif defined(__NetBSD__) - #define BOOST_PLATFORM "NetBSD " BOOST_STRINGIZE(__NetBSD__) - #define BOOST_NETBSD __NetBSD__ +#define BOOST_PLATFORM "NetBSD " BOOST_STRINGIZE(__NetBSD__) #elif defined(__OpenBSD__) - #define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__) - #define BOOST_OPENBSD __OpenBSD__ +#define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__) #elif defined(__DragonFly__) - #define BOOST_PLATFORM "DragonFly " BOOST_STRINGIZE(__DragonFly__) - #define BOOST_DFBSD __DragonFly__ +#define BOOST_PLATFORM "DragonFly " BOOST_STRINGIZE(__DragonFly__) #endif // diff --git a/include/boost/config/platform/cygwin.hpp b/include/boost/config/platform/cygwin.hpp index aba37193..8e1bcb01 100644 --- a/include/boost/config/platform/cygwin.hpp +++ b/include/boost/config/platform/cygwin.hpp @@ -1,56 +1,52 @@ -// (C) Copyright John Maddock 2001 - 2003 -// (C) Copyright Bryce Lelbach 2010 -// -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// See http://www.boost.org for most recent version. +// (C) Copyright John Maddock 2001 - 2003. +// Use, modification and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#define BOOST_PLATFORM "Cygwin" // Platform name. -#define BOOST_CYGWIN __CYGWIN__ // Boost platform ID macros. +// See http://www.boost.org for most recent version. +// cygwin specific config options: + +#define BOOST_PLATFORM "Cygwin" #define BOOST_HAS_DIRENT_H #define BOOST_HAS_LOG1P #define BOOST_HAS_EXPM1 -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -//#define BOOST_TRADEMARK_NIX 1 -#define BOOST_FUNCTIONAL_NIX 1 - -// See if we have POSIX threads, otherwise revert to native Win threads. +// +// Threading API: +// See if we have POSIX threads, if we do use them, otherwise +// revert to native Win threads. #define BOOST_HAS_UNISTD_H #include - -#if defined(_POSIX_THREADS) && (_POSIX_THREADS + 0 >= 0) && \ - !defined(BOOST_HAS_WINTHREADS) - #define BOOST_HAS_PTHREADS - #define BOOST_HAS_SCHED_YIELD - #define BOOST_HAS_GETTIMEOFDAY - #define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE - #define BOOST_HAS_SIGACTION +#if defined(_POSIX_THREADS) && (_POSIX_THREADS+0 >= 0) && !defined(BOOST_HAS_WINTHREADS) +# define BOOST_HAS_PTHREADS +# define BOOST_HAS_SCHED_YIELD +# define BOOST_HAS_GETTIMEOFDAY +# define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE +# define BOOST_HAS_SIGACTION #else - #if !defined(BOOST_HAS_WINTHREADS) - #define BOOST_HAS_WINTHREADS - #endif - #define BOOST_HAS_FTIME +# if !defined(BOOST_HAS_WINTHREADS) +# define BOOST_HAS_WINTHREADS +# endif +# define BOOST_HAS_FTIME #endif -// Find out if we have a stdint.h, there should be a better way to do this. +// +// find out if we have a stdint.h, there should be a better way to do this: +// #include - #ifdef _STDINT_H - #define BOOST_HAS_STDINT_H +#define BOOST_HAS_STDINT_H #endif -/// Cygwin has no fenv.h -#define BOOST_NO_FENV_H - +// boilerplate code: #include -// Cygwin lies about XSI conformance, there is no nl_types.h. +// +// Cygwin lies about XSI conformance, there is no nl_types.h: +// #ifdef BOOST_HAS_NL_TYPES_H - #undef BOOST_HAS_NL_TYPES_H +# undef BOOST_HAS_NL_TYPES_H #endif diff --git a/include/boost/config/platform/hpux.hpp b/include/boost/config/platform/hpux.hpp index 2aefb2d2..19ce68e5 100644 --- a/include/boost/config/platform/hpux.hpp +++ b/include/boost/config/platform/hpux.hpp @@ -3,7 +3,6 @@ // (C) Copyright David Abrahams 2002. // (C) Copyright Toon Knapen 2003. // (C) Copyright Boris Gubenko 2006 - 2007. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -14,13 +13,6 @@ #define BOOST_PLATFORM "HP-UX" -#define BOOST_HPUX 1 // platform ID macro - -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -#define BOOST_TRADEMARK_NIX 1 -//#define BOOST_FUNCTIONAL_NIX 1 - // In principle, HP-UX has a nice under the name // However, it has the following problem: // Use of UINT32_C(0) results in "0u l" for the preprocessed source diff --git a/include/boost/config/platform/irix.hpp b/include/boost/config/platform/irix.hpp index 4915d813..aeae49c8 100644 --- a/include/boost/config/platform/irix.hpp +++ b/include/boost/config/platform/irix.hpp @@ -1,6 +1,5 @@ // (C) Copyright John Maddock 2001 - 2003. // (C) Copyright Jens Maurer 2003. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -12,11 +11,6 @@ #define BOOST_PLATFORM "SGI Irix" -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -#define BOOST_TRADEMARK_NIX 1 -//#define BOOST_FUNCTIONAL_NIX 1 - #define BOOST_NO_SWPRINTF // // these are not auto detected by POSIX feature tests: diff --git a/include/boost/config/platform/linux.hpp b/include/boost/config/platform/linux.hpp index 3e7f02c7..51ae1334 100644 --- a/include/boost/config/platform/linux.hpp +++ b/include/boost/config/platform/linux.hpp @@ -1,6 +1,5 @@ // (C) Copyright John Maddock 2001 - 2003. // (C) Copyright Jens Maurer 2001 - 2003. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -14,13 +13,6 @@ // make sure we have __GLIBC_PREREQ if available at all #include -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -//#define BOOST_TRADEMARK_NIX 1 -#define BOOST_FUNCTIONAL_NIX 1 - -#define BOOST_LINUX 1 - // // added to glibc 2.1.1 // We can only test for 2.1 though: diff --git a/include/boost/config/platform/macos.hpp b/include/boost/config/platform/macos.hpp index d018703d..2780ef99 100644 --- a/include/boost/config/platform/macos.hpp +++ b/include/boost/config/platform/macos.hpp @@ -1,7 +1,6 @@ // (C) Copyright John Maddock 2001 - 2003. // (C) Copyright Darin Adler 2001 - 2002. // (C) Copyright Bill Kempf 2002. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -14,11 +13,6 @@ #if __MACH__ && !defined(_MSL_USING_MSL_C) -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -#define BOOST_TRADEMARK_NIX 1 -//#define BOOST_FUNCTIONAL_NIX 1 - // Using the Mac OS X system BSD-style C library. # ifndef BOOST_HAS_UNISTD_H diff --git a/include/boost/config/platform/qnxnto.hpp b/include/boost/config/platform/qnxnto.hpp index 0c54373d..b1377c8d 100644 --- a/include/boost/config/platform/qnxnto.hpp +++ b/include/boost/config/platform/qnxnto.hpp @@ -1,5 +1,4 @@ // (C) Copyright Jim Douglas 2005. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -8,15 +7,8 @@ // QNX specific config options: -#define BOOST_QNX 1 - #define BOOST_PLATFORM "QNX" -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -//#define BOOST_TRADEMARK_NIX 1 -#define BOOST_FUNCTIONAL_NIX 1 - #define BOOST_HAS_UNISTD_H #include diff --git a/include/boost/config/platform/solaris.hpp b/include/boost/config/platform/solaris.hpp index 9a9e1f46..9f925666 100644 --- a/include/boost/config/platform/solaris.hpp +++ b/include/boost/config/platform/solaris.hpp @@ -1,6 +1,5 @@ // (C) Copyright John Maddock 2001 - 2003. // (C) Copyright Jens Maurer 2003. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -11,11 +10,6 @@ #define BOOST_PLATFORM "Sun Solaris" -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -#define BOOST_TRADEMARK_NIX 1 -//#define BOOST_FUNCTIONAL_NIX 1 - #define BOOST_HAS_GETTIMEOFDAY // boilerplate code: diff --git a/include/boost/config/platform/symbian.hpp b/include/boost/config/platform/symbian.hpp index 798dfac4..ad379431 100644 --- a/include/boost/config/platform/symbian.hpp +++ b/include/boost/config/platform/symbian.hpp @@ -1,7 +1,6 @@ // (C) Copyright Yuriy Krasnoschek 2009. // (C) Copyright John Maddock 2001 - 2003. // (C) Copyright Jens Maurer 2001 - 2003. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,16 +9,13 @@ // symbian specific config options: + #define BOOST_PLATFORM "Symbian" #define BOOST_SYMBIAN 1 + #if defined(__S60_3X__) -// Open C / C++ plugin was introdused in this SDK, earlier versions don't have -// CRT / STL -# define BOOST_NIX 1 -//# define BOOST_GENETIC_NIX 1 -//# define BOOST_TRADEMARK_NIX 1 -# define BOOST_FUNCTIONAL_NIX 1 +// Open C / C++ plugin was introdused in this SDK, earlier versions don't have CRT / STL # define BOOST_S60_3rd_EDITION_FP2_OR_LATER_SDK // make sure we have __GLIBC_PREREQ if available at all # include diff --git a/include/boost/config/platform/vxworks.hpp b/include/boost/config/platform/vxworks.hpp index 3b128bf4..6ec5171e 100644 --- a/include/boost/config/platform/vxworks.hpp +++ b/include/boost/config/platform/vxworks.hpp @@ -1,5 +1,4 @@ // (C) Copyright Dustin Spicuzza 2009. -// (C) Copyright Bryce Lelbach 2010 // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -24,11 +23,6 @@ #define _POSIX_TIMERS 1 #define _POSIX_THREADS 1 -#define BOOST_NIX 1 -//#define BOOST_GENETIC_NIX 1 -#define BOOST_TRADEMARK_NIX 1 -//#define BOOST_FUNCTIONAL_NIX 1 - // vxworks doesn't work with asio serial ports #define BOOST_ASIO_DISABLE_SERIAL_PORT diff --git a/include/boost/config/platform/win32.hpp b/include/boost/config/platform/win32.hpp index 72c3dceb..690f464a 100644 --- a/include/boost/config/platform/win32.hpp +++ b/include/boost/config/platform/win32.hpp @@ -31,6 +31,7 @@ # define BOOST_SYMBOL_IMPORT __declspec(dllimport) #endif + #if defined(__MINGW32__) && ((__MINGW32_MAJOR_VERSION > 2) || ((__MINGW32_MAJOR_VERSION == 2) && (__MINGW32_MINOR_VERSION >= 0))) # define BOOST_HAS_STDINT_H # define __STDC_LIMIT_MACROS diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp index c048b896..f99d7d35 100644 --- a/include/boost/config/stdlib/libstdcpp3.hpp +++ b/include/boost/config/stdlib/libstdcpp3.hpp @@ -56,6 +56,11 @@ # define BOOST_HAS_THREADS #endif +#if !defined(CYGWIN) +# include +# define BOOST_HAS_FENV_H +#endif + #if !defined(_GLIBCPP_USE_LONG_LONG) \ && !defined(_GLIBCXX_USE_LONG_LONG)\ && defined(BOOST_HAS_LONG_LONG) @@ -64,16 +69,6 @@ # undef BOOST_HAS_LONG_LONG #endif -// Apple doesn't seem to reliably defined a *unix* macro -#if !defined(CYGWIN) && ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ - || defined(__APPLE) \ - || defined(APPLE)) -# include -#endif - #if defined(__GLIBCXX__) || (defined(__GLIBCPP__) && __GLIBCPP__>=20020514) // GCC >= 3.1.0 # define BOOST_STD_EXTENSION_NAMESPACE __gnu_cxx # define BOOST_HAS_SLIST diff --git a/include/boost/config/stdlib/sgi.hpp b/include/boost/config/stdlib/sgi.hpp index 5731fe5e..088e0471 100644 --- a/include/boost/config/stdlib/sgi.hpp +++ b/include/boost/config/stdlib/sgi.hpp @@ -40,14 +40,11 @@ # define BOOST_NO_STRINGSTREAM #endif -// Apple doesn't seem to reliably defined a *unix* macro -#if !defined(CYGWIN) && ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ - || defined(__APPLE) \ - || defined(APPLE)) +#if !defined(CYGWIN) && (defined(unix) || defined(__unix) || defined(__unix__)) # include +# if defined(_POSIX_VERSION) || defined(_XOPEN_VERSION) +# define BOOST_HAS_FENV_H +# endif #endif diff --git a/include/boost/config/stdlib/stlport.hpp b/include/boost/config/stdlib/stlport.hpp index 85176a4d..098da44e 100644 --- a/include/boost/config/stdlib/stlport.hpp +++ b/include/boost/config/stdlib/stlport.hpp @@ -16,14 +16,11 @@ # endif #endif -// Apple doesn't seem to reliably defined a *unix* macro -#if !defined(CYGWIN) && ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ - || defined(__APPLE) \ - || defined(APPLE)) +#if !defined(CYGWIN) && (defined(unix) || defined(__unix) || defined(__unix__)) # include +# if defined(_POSIX_VERSION) || defined(_XOPEN_VERSION) +# define BOOST_HAS_FENV_H +# endif #endif // diff --git a/include/boost/config/stdlib/vacpp.hpp b/include/boost/config/stdlib/vacpp.hpp index 3fcf6e05..904e0681 100644 --- a/include/boost/config/stdlib/vacpp.hpp +++ b/include/boost/config/stdlib/vacpp.hpp @@ -12,14 +12,11 @@ #define BOOST_HAS_MACRO_USE_FACET #define BOOST_NO_STD_MESSAGES -// Apple doesn't seem to reliably defined a *unix* macro -#if !defined(CYGWIN) && ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ - || defined(__APPLE) \ - || defined(APPLE)) +#if !defined(CYGWIN) && (defined(unix) || defined(__unix) || defined(__unix__)) # include +# if defined(_POSIX_VERSION) || defined(_XOPEN_VERSION) +# define BOOST_HAS_FENV_H +# endif #endif // C++0x headers not yet implemented diff --git a/include/boost/config/suffix.hpp b/include/boost/config/suffix.hpp index 4e608d24..31859144 100644 --- a/include/boost/config/suffix.hpp +++ b/include/boost/config/suffix.hpp @@ -639,10 +639,6 @@ namespace std{ using ::typeinfo; } # if defined(unix) || defined(__unix) || defined(_XOPEN_SOURCE) \ || defined(_POSIX_SOURCE) # define BOOST_PLATFORM "Generic Unix" -# define BOOST_NIX 1 -//# define BOOST_GENETIC_NIX 1 -//# define BOOST_TRADEMARK_NIX 1 -# define BOOST_FUNCTIONAL_NIX 1 # else # define BOOST_PLATFORM "Unknown" # endif diff --git a/test/boost_no_fenv_h.ipp b/test/boost_no_fenv_h.ipp deleted file mode 100644 index 97ed5124..00000000 --- a/test/boost_no_fenv_h.ipp +++ /dev/null @@ -1,78 +0,0 @@ -// (C) Copyright John Maddock 2001. -// (C) Copyright Bryce Lelbach 2010. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/config for most recent version. - -// MACRO: BOOST_NO_FENV_H -// TITLE: fenv.h -// DESCRIPTION: There is no POSIX available. If is -// available, should be included -// instead of directly including . - -#include - -namespace boost_no_fenv_h { - -int test() -{ - /// POSIX required typedefs - typedef ::fenv_t has_fenv_t; - typedef ::fexcept_t has_fexcept_t; - - /// POSIX required macros - #if !defined(FE_DIVBYZERO) - #error platform does not define FE_DIVBYZERO - #endif - - #if !defined(FE_INEXACT) - #error platform does not define FE_INEXACT - #endif - - #if !defined(FE_INVALID) - #error platform does not define FE_INVALID - #endif - - #if !defined(FE_OVERFLOW) - #error platform does not define FE_OVERFLOW - #endif - - #if !defined(FE_UNDERFLOW) - #error platform does not define FE_UNDERFLOW - #endif - - #if !defined(FE_DOWNWARD) - #error platform does not define FE_DOWNWARD - #endif - - #if !defined(FE_TONEAREST) - #error platform does not define FE_TONEAREST - #endif - - #if !defined(FE_UPWARD) - #error platform does not define FE_UPWARD - #endif - - #if !defined(FE_DFL_ENV) - #error platform does not define FE_DFL_ENV - #endif - - int (*has_feclearexcept)(int) = ::feclearexcept; - int (*has_fegetenv)(fenv_t*) = ::fegetenv; - int (*has_fegetexcept)(fexcept_t*, int) = ::fegetexcept; - int (*has_fegetround)(void) = ::fegetround; - int (*has_feholdexcept)(fenv_t*) = ::feholdexcept; - int (*has_feraiseexcept)(int) = ::feraiseexcept; - int (*has_fesetenv)(const fenv_t*) = ::fesetenv; - int (*has_fesetexceptflag)(const fexcept_t*, int) = ::fesetexceptflag; - int (*has_fesetround)(int) = ::fesetround; - int (*has_fetestexcept)(int) = ::fetestexcept; - int (*has_feupdateenv)(const fenv_t*) = ::feupdateenv; - - return 0; -} - -} - diff --git a/test/no_fenv_h_fail.cpp b/test/no_fenv_h_fail.cpp deleted file mode 100644 index 9b2f4103..00000000 --- a/test/no_fenv_h_fail.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright Bryce Lelbach 2010. -// Copyright John Maddock 2002-4. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/config for the most recent version. - -// Test file for macro BOOST_NO_FENV_H -// This file should not compile, if it does then -// BOOST_NO_FENV_H should not be defined. -// See file boost_no_fenv_h.ipp for details - -// Must not have BOOST_ASSERT_CONFIG set; it defeats -// the objective of this file: -#ifdef BOOST_ASSERT_CONFIG -# undef BOOST_ASSERT_CONFIG -#endif - -#include -#include "test.hpp" - -#ifdef BOOST_NO_FENV_H -#include "boost_no_fenv_h.ipp" -#else -#error "this file should not compile" -#endif - -int main( int, char *[] ) -{ - return boost_no_fenv_h::test(); -} - diff --git a/test/no_fenv_h_pass.cpp b/test/no_fenv_h_pass.cpp deleted file mode 100644 index 573d6244..00000000 --- a/test/no_fenv_h_pass.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright Bryce Lelbach 2010. -// Copyright John Maddock 2002-4. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/config for the most recent version. - -// Test file for macro BOOST_NO_FENV_H -// This file should compile, if it does not then -// BOOST_NO_FENV_H should be defined. -// See file boost_no_fenv_h.ipp for details - -// Must not have BOOST_ASSERT_CONFIG set; it defeats -// the objective of this file: -#ifdef BOOST_ASSERT_CONFIG -# undef BOOST_ASSERT_CONFIG -#endif - -#include -#include "test.hpp" - -#ifndef BOOST_NO_FENV_H -#include "boost_no_fenv_h.ipp" -#else -namespace boost_no_fenv_h = empty_boost; -#endif - -int main( int, char *[] ) -{ - return boost_no_fenv_h::test(); -} -