[Boost-commit] svn:boost r75950 - in sandbox/predef: boost/predef/library/std libs/predef/test

Subject: [Boost-commit] svn:boost r75950 - in sandbox/predef: boost/predef/library/std libs/predef/test
From: grafikrobot_at_[hidden]
Date: 2011-12-15 00:07:18

Author: grafik
Date: 2011-12-15 00:07:17 EST (Thu, 15 Dec 2011)
New Revision: 75950
URL: http://svn.boost.org/trac/boost/changeset/75950

Log:
[predef] Fix typo in Dinkumware predef used vs. detected. Rearrange the C test file to work in pure-C modes. Tested to on Windows with MSVC9.
Text files modified: 
   sandbox/predef/boost/predef/library/std/dinkumware.h |     2 +-                                      
   sandbox/predef/libs/predef/test/info_as_c.c          |     2 +-                                      
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: sandbox/predef/boost/predef/library/std/dinkumware.h
==============================================================================
--- sandbox/predef/boost/predef/library/std/dinkumware.h	(original)
+++ sandbox/predef/boost/predef/library/std/dinkumware.h	2011-12-15 00:07:17 EST (Thu, 15 Dec 2011)
@@ -23,7 +23,7 @@
 #if (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
     #undef BOOST_LIBSTD_DINKUMWARE
     #if defined(_CPPLIB_VER)
-        #define BOOST_LIBSTD_DINKUMWARE BOOST_PREDEF_MAKE_NN_NN(__CPPLIB_VER)
+        #define BOOST_LIBSTD_DINKUMWARE BOOST_PREDEF_MAKE_NN_NN(_CPPLIB_VER)
     #else
         #define BOOST_LIBSTD_DINKUMWARE BOOST_VERSION_NUMBER(0,0,1)
     #endif

Modified: sandbox/predef/libs/predef/test/info_as_c.c
==============================================================================
--- sandbox/predef/libs/predef/test/info_as_c.c	(original)
+++ sandbox/predef/libs/predef/test/info_as_c.c	2011-12-15 00:07:17 EST (Thu, 15 Dec 2011)
@@ -35,6 +35,7 @@
 
 int main()
 {
+	unsigned x = 0;
         predef_info ** predefs = 0;
         unsigned predef_count = 0;
         unsigned * i = &first_predef_info.tag;
@@ -50,7 +51,6 @@
                 }
         }
         qsort(predefs,predef_count,sizeof(predef_info*),predef_info_compare);
-	int x = 0;
         puts("** Detected **");
         for (x = 0; x < predef_count; ++x)
         {