[Boost-commit] svn:boost r86312 - in trunk: boost/predef/os libs/predef/test

Subject: [Boost-commit] svn:boost r86312 - in trunk: boost/predef/os libs/predef/test
From: grafikrobot_at_[hidden]
Date: 2013-10-15 00:02:57

Author: grafik
Date: 2013-10-15 00:02:57 EDT (Tue, 15 Oct 2013)
New Revision: 86312
URL: http://svn.boost.org/trac/boost/changeset/86312

Log:
Fix repeat def of OS_BSD when sub-BSD flavor detected. Fix some make tests that fail on non-2003 compile modes.

Text files modified: 
   trunk/boost/predef/os/bsd.h     |     2 ++                                      
   trunk/libs/predef/test/make.cpp |     4 ++--                                    
   2 files changed, 4 insertions(+), 2 deletions(-)

Modified: trunk/boost/predef/os/bsd.h
==============================================================================
--- trunk/boost/predef/os/bsd.h	Mon Oct 14 17:35:20 2013	(r86311)
+++ trunk/boost/predef/os/bsd.h	2013-10-15 00:02:57 EDT (Tue, 15 Oct 2013)	(r86312)
@@ -48,7 +48,9 @@
 #include <boost/predef/os/bsd/open.h>
 #include <boost/predef/os/bsd/net.h>
 
+#ifndef BOOST_OS_BSD
 #define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#endif
 
 #if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
     defined(BSD) || \

Modified: trunk/libs/predef/test/make.cpp
==============================================================================
--- trunk/libs/predef/test/make.cpp	Mon Oct 14 17:35:20 2013	(r86311)
+++ trunk/libs/predef/test/make.cpp	2013-10-15 00:02:57 EDT (Tue, 15 Oct 2013)	(r86312)
@@ -45,8 +45,8 @@
     PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRRPP(99999) == BOOST_VERSION_NUMBER(9,99,99));
     PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP000(999000) == BOOST_VERSION_NUMBER(9,9,9));
     PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR000(999000) == BOOST_VERSION_NUMBER(9,99,0));
-    PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900) == BOOST_VERSION_NUMBER(21,99,99));
-    PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900L) == BOOST_VERSION_NUMBER(99,99,99));
+    PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900u) == BOOST_VERSION_NUMBER(21,99,99));
+    /* PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900ull) == BOOST_VERSION_NUMBER(99,99,99)); */
     PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PP00(999909900) == BOOST_VERSION_NUMBER(99,99,99));
     PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VV00(9900) == BOOST_VERSION_NUMBER(99,00,00));
     PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PPPP(999909999) == BOOST_VERSION_NUMBER(99,99,9999));