From 40a722d69b216fd2e7981c7467ab539ead099cb3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 6 Jul 2014 21:49:24 -0500 Subject: [PATCH 1/3] Fix warning for undefined macro usage. --- include/boost/predef/os/aix.h | 2 +- include/boost/predef/os/amigaos.h | 2 +- include/boost/predef/os/android.h | 2 +- include/boost/predef/os/beos.h | 2 +- include/boost/predef/os/bsd.h | 2 +- include/boost/predef/os/bsd/bsdi.h | 2 +- include/boost/predef/os/bsd/dragonfly.h | 2 +- include/boost/predef/os/bsd/free.h | 2 +- include/boost/predef/os/bsd/net.h | 2 +- include/boost/predef/os/bsd/open.h | 2 +- include/boost/predef/os/cygwin.h | 2 +- include/boost/predef/os/hpux.h | 2 +- include/boost/predef/os/ios.h | 2 +- include/boost/predef/os/irix.h | 2 +- include/boost/predef/os/linux.h | 2 +- include/boost/predef/os/macos.h | 2 +- include/boost/predef/os/os400.h | 2 +- include/boost/predef/os/qnxnto.h | 2 +- include/boost/predef/os/solaris.h | 2 +- include/boost/predef/os/unix.h | 2 +- include/boost/predef/os/vms.h | 2 +- include/boost/predef/os/windows.h | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/boost/predef/os/aix.h b/include/boost/predef/os/aix.h index 6495fb2..07523c8 100644 --- a/include/boost/predef/os/aix.h +++ b/include/boost/predef/os/aix.h @@ -32,7 +32,7 @@ Version number available as major, minor, and patch. #define BOOST_OS_AIX BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(_AIX) || defined(__TOS_AIX__) \ ) # undef BOOST_OS_AIX diff --git a/include/boost/predef/os/amigaos.h b/include/boost/predef/os/amigaos.h index 81354f2..fae2408 100644 --- a/include/boost/predef/os/amigaos.h +++ b/include/boost/predef/os/amigaos.h @@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_AMIGAOS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(AMIGA) || defined(__amigaos__) \ ) # undef BOOST_OS_AMIGAOS diff --git a/include/boost/predef/os/android.h b/include/boost/predef/os/android.h index 69593e5..0de5870 100644 --- a/include/boost/predef/os/android.h +++ b/include/boost/predef/os/android.h @@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__ANDROID__) \ ) # undef BOOST_OS_ANDROID diff --git a/include/boost/predef/os/beos.h b/include/boost/predef/os/beos.h index 349857d..7a92b94 100644 --- a/include/boost/predef/os/beos.h +++ b/include/boost/predef/os/beos.h @@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BEOS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__BEOS__) \ ) # undef BOOST_OS_BEOS diff --git a/include/boost/predef/os/bsd.h b/include/boost/predef/os/bsd.h index ad4c1c8..f370f56 100644 --- a/include/boost/predef/os/bsd.h +++ b/include/boost/predef/os/bsd.h @@ -59,7 +59,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.] #define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE #endif -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(BSD) || \ defined(_SYSTYPE_BSD) \ ) diff --git a/include/boost/predef/os/bsd/bsdi.h b/include/boost/predef/os/bsd/bsdi.h index 09e8a29..cb57e1b 100644 --- a/include/boost/predef/os/bsd/bsdi.h +++ b/include/boost/predef/os/bsd/bsdi.h @@ -24,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__bsdi__) \ ) # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/include/boost/predef/os/bsd/dragonfly.h b/include/boost/predef/os/bsd/dragonfly.h index 20d7aae..202f8a1 100644 --- a/include/boost/predef/os/bsd/dragonfly.h +++ b/include/boost/predef/os/bsd/dragonfly.h @@ -24,7 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__DragonFly__) \ ) # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/include/boost/predef/os/bsd/free.h b/include/boost/predef/os/bsd/free.h index 93f49a2..404e8ed 100644 --- a/include/boost/predef/os/bsd/free.h +++ b/include/boost/predef/os/bsd/free.h @@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__FreeBSD__) \ ) # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/include/boost/predef/os/bsd/net.h b/include/boost/predef/os/bsd/net.h index 09e4d50..dcc4131 100644 --- a/include/boost/predef/os/bsd/net.h +++ b/include/boost/predef/os/bsd/net.h @@ -31,7 +31,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__NETBSD__) || defined(__NetBSD__) \ ) # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/include/boost/predef/os/bsd/open.h b/include/boost/predef/os/bsd/open.h index 401ccae..e81ebc6 100644 --- a/include/boost/predef/os/bsd/open.h +++ b/include/boost/predef/os/bsd/open.h @@ -55,7 +55,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__OpenBSD__) \ ) # ifndef BOOST_OS_BSD_AVAILABLE diff --git a/include/boost/predef/os/cygwin.h b/include/boost/predef/os/cygwin.h index 9ffab86..04ee399 100644 --- a/include/boost/predef/os/cygwin.h +++ b/include/boost/predef/os/cygwin.h @@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__CYGWIN__) \ ) # undef BOOST_OS_CYGWIN diff --git a/include/boost/predef/os/hpux.h b/include/boost/predef/os/hpux.h index e764d9c..946196f 100644 --- a/include/boost/predef/os/hpux.h +++ b/include/boost/predef/os/hpux.h @@ -27,7 +27,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_HPUX BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(hpux) || defined(_hpux) || defined(__hpux) \ ) # undef BOOST_OS_HPUX diff --git a/include/boost/predef/os/ios.h b/include/boost/predef/os/ios.h index 97e1bb8..b83a9db 100644 --- a/include/boost/predef/os/ios.h +++ b/include/boost/predef/os/ios.h @@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_IOS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__APPLE__) && defined(__MACH__) && \ defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) \ ) diff --git a/include/boost/predef/os/irix.h b/include/boost/predef/os/irix.h index cc10552..a9e63b8 100644 --- a/include/boost/predef/os/irix.h +++ b/include/boost/predef/os/irix.h @@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_IRIX BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(sgi) || defined(__sgi) \ ) # undef BOOST_OS_IRIX diff --git a/include/boost/predef/os/linux.h b/include/boost/predef/os/linux.h index 2c07c68..b436e3f 100644 --- a/include/boost/predef/os/linux.h +++ b/include/boost/predef/os/linux.h @@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_LINUX BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(linux) || defined(__linux) \ ) # undef BOOST_OS_LINUX diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h index 9fd8d2a..cdcf2cb 100644 --- a/include/boost/predef/os/macos.h +++ b/include/boost/predef/os/macos.h @@ -39,7 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(macintosh) || defined(Macintosh) || \ (defined(__APPLE__) && defined(__MACH__)) \ ) diff --git a/include/boost/predef/os/os400.h b/include/boost/predef/os/os400.h index 2154189..f7aacf5 100644 --- a/include/boost/predef/os/os400.h +++ b/include/boost/predef/os/os400.h @@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_OS400 BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__OS400__) \ ) # undef BOOST_OS_OS400 diff --git a/include/boost/predef/os/qnxnto.h b/include/boost/predef/os/qnxnto.h index 1ba324c..dff536f 100644 --- a/include/boost/predef/os/qnxnto.h +++ b/include/boost/predef/os/qnxnto.h @@ -31,7 +31,7 @@ version 4 is specifically detected. #define BOOST_OS_QNX BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(__QNX__) || defined(__QNXNTO__) \ ) # undef BOOST_OS_QNX diff --git a/include/boost/predef/os/solaris.h b/include/boost/predef/os/solaris.h index df5240b..4d47dfe 100644 --- a/include/boost/predef/os/solaris.h +++ b/include/boost/predef/os/solaris.h @@ -26,7 +26,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_SOLARIS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(sun) || defined(__sun) \ ) # undef BOOST_OS_SOLARIS diff --git a/include/boost/predef/os/unix.h b/include/boost/predef/os/unix.h index 6739e09..3d1dcb0 100644 --- a/include/boost/predef/os/unix.h +++ b/include/boost/predef/os/unix.h @@ -28,7 +28,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_UNIX BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(unix) || defined(__unix) || \ defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) \ ) diff --git a/include/boost/predef/os/vms.h b/include/boost/predef/os/vms.h index 2e0868e..3d34f63 100644 --- a/include/boost/predef/os/vms.h +++ b/include/boost/predef/os/vms.h @@ -28,7 +28,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_VMS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(VMS) || defined(__VMS) \ ) # undef BOOST_OS_VMS diff --git a/include/boost/predef/os/windows.h b/include/boost/predef/os/windows.h index c22eef1..9072539 100644 --- a/include/boost/predef/os/windows.h +++ b/include/boost/predef/os/windows.h @@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_WINDOWS BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \ +#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ defined(_WIN32) || defined(_WIN64) || \ defined(__WIN32__) || defined(__TOS_WIN__) || \ defined(__WINDOWS__) \ From 2decd4f4bfe10b451d7a483122974f693f3de851 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 7 Jul 2014 08:21:22 -0500 Subject: [PATCH 2/3] Let OS_UNIX be detected at all times as it overlaps with other OS types. --- include/boost/predef/os/unix.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/boost/predef/os/unix.h b/include/boost/predef/os/unix.h index 3d1dcb0..1ba06c9 100644 --- a/include/boost/predef/os/unix.h +++ b/include/boost/predef/os/unix.h @@ -28,10 +28,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_UNIX BOOST_VERSION_NUMBER_NOT_AVAILABLE -#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \ - defined(unix) || defined(__unix) || \ - defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) \ - ) +#if defined(unix) || defined(__unix) || \ + defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) # undef BOOST_OS_UNIX # define BOOST_OS_UNIX BOOST_VERSION_NUMBER_AVAILABLE #endif From 372b4bd47701beeae382187c99de2b9d90637881 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 7 Jul 2014 08:25:21 -0500 Subject: [PATCH 3/3] Fix OS_SVR4 missing AVAILABLE macro def. Fix marking OS_UNIX as exclusive. --- include/boost/predef/os/unix.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/boost/predef/os/unix.h b/include/boost/predef/os/unix.h index 1ba06c9..3636dda 100644 --- a/include/boost/predef/os/unix.h +++ b/include/boost/predef/os/unix.h @@ -36,7 +36,6 @@ http://www.boost.org/LICENSE_1_0.txt) #if BOOST_OS_UNIX # define BOOST_OS_UNIX_AVAILABLE -# include #endif #define BOOST_OS_UNIX_NAME "Unix Environment" @@ -64,8 +63,8 @@ http://www.boost.org/LICENSE_1_0.txt) # define BOOST_OS_SVR4 BOOST_VERSION_NUMBER_AVAILABLE #endif -#if BOOST_ARCH_ALPHA -# define _AVAILABLE +#if BOOST_OS_SVR4 +# define BOOST_OS_SVR4_AVAILABLE #endif #define BOOST_OS_SVR4_NAME "SVR4 Environment"