Fix non-standard test feature test collection. I.e. make the feature

collection no rely on implementioned defined behaviour. And fix check
program handling of no-expression invocations vs expression invocations.

check/predef_check.h

@@ -0,0 +1,98 @@
+/*
+Copyright Rene Rivera 2011-2015
+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)
+*/
+#include <boost/predef/detail/test_def.h>
+
+const char * str_token(const char ** str, const char * space)
+{
+    unsigned span;
+    char * token;
+    for (; **str != 0; *str += 1)
+    {
+        if (0 == strchr(space, **str))
+        {
+            break;
+        }
+    }
+    span = strcspn(*str, space);
+    token = (char *)malloc(span+1);
+    strncpy(token, *str, span);
+    token[span] = 0;
+    for (*str += span; **str != 0; *str += 1)
+    {
+        if (0 == strchr(space, **str))
+        {
+            break;
+        }
+    }
+    return token;
+}
+
+const char * whitespace = " ";
+const char * dot = ".";
+
+int main(int argc, const char ** argv)
+{
+    unsigned x = 0;
+    int argi = 1;
+    create_predef_entries();
+#if 0
+    qsort(generated_predef_info,generated_predef_info_count,
+        sizeof(predef_info),predef_info_compare);
+    for (x = 0; x < generated_predef_info_count; ++x)
+    {
+        printf("%s: %d\n", generated_predef_info[x].name, generated_predef_info[x].value);
+    }
+#endif
+    int result = -1;
+    for (argi = 1; argi < argc; ++argi)
+    {
+        const char * exp = argv[argi];
+        const char * exp_name = str_token(&exp, whitespace);
+        const char * exp_op = str_token(&exp, whitespace);
+        const char * exp_val = str_token(&exp, whitespace);
+        unsigned exp_version = 0;
+        if (*exp_val != 0)
+        {
+            exp = exp_val;
+            const char * exp_val_a = str_token(&exp, dot);
+            const char * exp_val_b = str_token(&exp, dot);
+            const char * exp_val_c = str_token(&exp, dot);
+            exp_version = BOOST_VERSION_NUMBER(atoi(exp_val_a), atoi(exp_val_b),atoi(exp_val_c));
+        }
+        for (x = 0; x < generated_predef_info_count; ++x)
+        {
+            if (*exp_op == 0 &&
+                generated_predef_info[x].value > 0 &&
+                strcmp(exp_name, generated_predef_info[x].name) == 0)
+            {
+                /* Expression of the form "BOOST_x_yy" is true. */
+                result = 0;
+                break;
+            }
+            else if (*exp_op == 0 &&
+                generated_predef_info[x].value == 0 &&
+                strcmp(exp_name, generated_predef_info[x].name) == 0)
+            {
+                /* Expression of the form "BOOST_x_yy" is false. */
+                return argi;
+            }
+            else if (*exp_op != 0 && *exp_val != 0 &&
+                strcmp(exp_name, generated_predef_info[x].name) == 0)
+            {
+                /* Expression of the form "BOOST_x_yy op val". */
+                result = 0;
+                if (0 == strcmp(">",exp_op) && !(generated_predef_info[x].value > exp_version)) return argi;
+                if (0 == strcmp("<",exp_op) && !(generated_predef_info[x].value < exp_version)) return argi;
+                if (0 == strcmp(">=",exp_op) && !(generated_predef_info[x].value >= exp_version)) return argi;
+                if (0 == strcmp("<=",exp_op) && !(generated_predef_info[x].value <= exp_version)) return argi;
+                if (0 == strcmp("==",exp_op) && !(generated_predef_info[x].value == exp_version)) return argi;
+                if (0 == strcmp("!=",exp_op) && !(generated_predef_info[x].value != exp_version)) return argi;
+            }
+        }
+    }
+    return result;
+}

check/predef_check_as_c.c

@@ -4,116 +4,4 @@ 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)
 */
-#include <string.h>
+#include "predef_check.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-#define BOOST_PREDEF_INTERNAL_GENERATE_TESTS
-
-typedef struct predef_info
-{
-    unsigned tag;
-    const char * name;
-    const char * description;
-    unsigned value;
-} predef_info;
-
-predef_info first_predef_info = { 0x43210DEF , "-" , "-" , 0xFFFFFFFF };
-
-#define BOOST_PREDEF_DECLARE_TEST(x,s) \
-    predef_info x##_predef_info = { 0x67890DEF , #x , s , x };
-#include <boost/predef.h>
-
-predef_info last_predef_info = { 0xFFFFFFFF , "-" , "-" , 0x43210DEF };
-
-int predef_info_compare(const void * a, const void * b)
-{
-    const predef_info ** i = (const predef_info **)a;
-    const predef_info ** j = (const predef_info **)b;
-    return strcmp((*i)->name,(*j)->name);
-}
-
-const char * str_token(const char ** str, const char * space)
-{
-    unsigned span;
-    char * token;
-    for (; **str != 0; *str += 1)
-    {
-        if (0 == strchr(space, **str))
-        {
-            break;
-        }
-    }
-    span = strcspn(*str, space);
-    token = (char *)malloc(span+1);
-    strncpy(token, *str, span);
-    token[span] = 0;
-    for (*str += span; **str != 0; *str += 1)
-    {
-        if (0 == strchr(space, **str))
-        {
-            break;
-        }
-    }
-    return token;
-}
-
-const char * whitespace = " ";
-const char * dot = ".";
-
-int main(int argc, const char ** argv)
-{
-    unsigned x = 0;
-    int argi = 1;
-    predef_info ** predefs = 0;
-    unsigned predef_count = 0;
-    unsigned * i = &first_predef_info.tag;
-    unsigned * e = &last_predef_info.tag;
-    while (i < e)
-    {
-        i += 1;
-        if (*i == 0x67890DEF)
-        {
-            predef_count += 1;
-            predefs = (predef_info**)realloc(predefs,predef_count*sizeof(predef_info*));
-            predefs[predef_count-1] = (predef_info*)i;
-        }
-    }
-    qsort(predefs,predef_count,sizeof(predef_info*),predef_info_compare);
-    for (argi = 1; argi < argc; ++argi)
-    {
-        const char * exp = argv[argi];
-        const char * exp_name = str_token(&exp, whitespace);
-        const char * exp_op = str_token(&exp, whitespace);
-        const char * exp_val = str_token(&exp, whitespace);
-        unsigned exp_version = 0;
-        if (*exp_val != 0)
-        {
-            exp = exp_val;
-            const char * exp_val_a = str_token(&exp, dot);
-            const char * exp_val_b = str_token(&exp, dot);
-            const char * exp_val_c = str_token(&exp, dot);
-            exp_version = BOOST_VERSION_NUMBER(atoi(exp_val_a), atoi(exp_val_b),atoi(exp_val_c));
-        }
-        for (x = 0; x < predef_count; ++x)
-        {
-            if (*exp_op == 0 &&
-                predefs[x]->value == 0 &&
-                strcmp(exp_name, predefs[x]->name) == 0)
-            {
-                return argi;
-            }
-            else if (*exp_op != 0 && *exp_val != 0 &&
-                     strcmp(exp_name, predefs[x]->name) == 0)
-            {
-                if (0 == strcmp(">",exp_op) && !(predefs[x]->value > exp_version)) return argi;
-                if (0 == strcmp("<",exp_op) && !(predefs[x]->value < exp_version)) return argi;
-                if (0 == strcmp(">=",exp_op) && !(predefs[x]->value >= exp_version)) return argi;
-                if (0 == strcmp("<=",exp_op) && !(predefs[x]->value <= exp_version)) return argi;
-                if (0 == strcmp("==",exp_op) && !(predefs[x]->value == exp_version)) return argi;
-                if (0 == strcmp("!=",exp_op) && !(predefs[x]->value != exp_version)) return argi;
-            }
-        }
-    }
-    return 0;
-}

check/predef_check_as_cpp.cpp

@@ -1 +1,7 @@
-#include "predef_check_as_c.c"
+/*
+Copyright Rene Rivera 2011-2015
+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)
+*/
+#include "predef_check.h"

check/predef_check_as_objc.m

@@ -1 +1,7 @@
-#include "predef_check_as_c.c"
+/*
+Copyright Rene Rivera 2011-2015
+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)
+*/
+#include "predef_check.h"

check/predef_check_as_objcpp.mm

@@ -1 +1,7 @@
-#include "predef_check_as_c.c"
+/*
+Copyright Rene Rivera 2011-2015
+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)
+*/
+#include "predef_check.h"

include/boost/predef.h

@@ -1,12 +1,14 @@
 /*
-Copyright Rene Rivera 2008-2013
+Copyright Rene Rivera 2008-2015
 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)
 */
 
+#if !defined(BOOST_PREDEF_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
 #ifndef BOOST_PREDEF_H
 #define BOOST_PREDEF_H
+#endif
 
 #include <boost/predef/language.h>
 #include <boost/predef/architecture.h>

include/boost/predef/architecture.h

@@ -1,12 +1,14 @@
 /*
-Copyright Rene Rivera 2008-2013
+Copyright Rene Rivera 2008-2015
 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)
 */
 
+#if !defined(BOOST_PREDEF_ARCHITECTURE_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
 #ifndef BOOST_PREDEF_ARCHITECTURE_H
 #define BOOST_PREDEF_ARCHITECTURE_H
+#endif
 
 #include <boost/predef/architecture/alpha.h>
 #include <boost/predef/architecture/arm.h>

include/boost/predef/architecture/alpha.h

@@ -53,8 +53,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_ALPHA_NAME "DEC Alpha"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_ALPHA,BOOST_ARCH_ALPHA_NAME)
-
-
-#endif

include/boost/predef/architecture/arm.h

@@ -64,8 +64,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_ARM_NAME "ARM"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_ARM,BOOST_ARCH_ARM_NAME)
-
-
-#endif

include/boost/predef/architecture/blackfin.h

@@ -40,8 +40,7 @@ Blackfin Processors from Analog Devices.
 
 #define BOOST_ARCH_BLACKFIN_NAME "Blackfin"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_BLACKFIN,BOOST_ARCH_BLACKFIN_NAME)
-
-
-#endif

include/boost/predef/architecture/convex.h

@@ -59,9 +59,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_CONVEX_NAME "Convex Computer"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_CONVEX,BOOST_ARCH_CONVEX_NAME)
-
-
-
-#endif

include/boost/predef/architecture/ia64.h

@@ -43,7 +43,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_IA64_NAME "Intel Itanium 64"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_IA64,BOOST_ARCH_IA64_NAME)
-
-#endif

include/boost/predef/architecture/m68k.h

@@ -76,8 +76,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_M68K_NAME "Motorola 68k"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_M68K,BOOST_ARCH_M68K_NAME)
-
-
-#endif

include/boost/predef/architecture/mips.h

@@ -67,8 +67,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_MIPS_NAME "MIPS"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_MIPS,BOOST_ARCH_MIPS_NAME)
-
-
-#endif

include/boost/predef/architecture/parisc.h

@@ -58,8 +58,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_PARISC_NAME "HP/PA RISC"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PARISC,BOOST_ARCH_PARISC_NAME)
-
-
-#endif

include/boost/predef/architecture/ppc.h

@@ -66,8 +66,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_PPC_NAME "PowerPC"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PPC,BOOST_ARCH_PPC_NAME)
-
-
-#endif

include/boost/predef/architecture/pyramid.h

@@ -36,8 +36,7 @@ Pyramid 9810 architecture.
 
 #define BOOST_ARCH_PYRAMID_NAME "Pyramid 9810"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PYRAMID,BOOST_ARCH_PYRAMID_NAME)
-
-
-#endif

include/boost/predef/architecture/rs6k.h

@@ -42,9 +42,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_RS6000_NAME "RS/6000"
 
-#include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RS6000,BOOST_ARCH_RS6000_NAME)
-
 #define BOOST_ARCH_PWR BOOST_ARCH_RS6000
 
 #if BOOST_ARCH_PWR
@@ -54,3 +51,6 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RS6000,BOOST_ARCH_RS6000_NAME)
 #define BOOST_ARCH_PWR_NAME BOOST_ARCH_RS6000_NAME
 
 #endif
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RS6000,BOOST_ARCH_RS6000_NAME)

include/boost/predef/architecture/sparc.h

@@ -48,8 +48,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_SPARC_NAME "SPARC"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SPARC,BOOST_ARCH_SPARC_NAME)
-
-
-#endif

include/boost/predef/architecture/superh.h

@@ -61,8 +61,7 @@ If available versions \[1-5\] are specifically detected.
 
 #define BOOST_ARCH_SH_NAME "SuperH"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SH,BOOST_ARCH_SH_NAME)
-
-
-#endif

include/boost/predef/architecture/sys370.h

@@ -37,8 +37,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_SYS370_NAME "System/370"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SYS370,BOOST_ARCH_SYS370_NAME)
-
-
-#endif

include/boost/predef/architecture/sys390.h

@@ -37,8 +37,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_SYS390_NAME "System/390"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SYS390,BOOST_ARCH_SYS390_NAME)
-
-
-#endif

include/boost/predef/architecture/x86.h

@@ -5,12 +5,12 @@ Distributed under the Boost Software License, Version 1.0.
 http://www.boost.org/LICENSE_1_0.txt)
 */
 
-#ifndef BOOST_PREDEF_ARCHITECTURE_X86_H
-#define BOOST_PREDEF_ARCHITECTURE_X86_H
-
 #include <boost/predef/architecture/x86/32.h>
 #include <boost/predef/architecture/x86/64.h>
 
+#ifndef BOOST_PREDEF_ARCHITECTURE_X86_H
+#define BOOST_PREDEF_ARCHITECTURE_X86_H
+
 /*`
 [heading `BOOST_ARCH_X86`]
 
@@ -32,7 +32,7 @@ a category to indicate that either `BOOST_ARCH_X86_32` or
 
 #define BOOST_ARCH_X86_NAME "Intel x86"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86,BOOST_ARCH_X86_NAME)
-
-#endif

include/boost/predef/architecture/x86/32.h

@@ -79,9 +79,9 @@ If available versions \[3-6\] are specifically detected.
 
 #define BOOST_ARCH_X86_32_NAME "Intel x86-32"
 
-#include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86_32,BOOST_ARCH_X86_32_NAME)
-
 #include <boost/predef/architecture/x86.h>
 
 #endif
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86_32,BOOST_ARCH_X86_32_NAME)

include/boost/predef/architecture/x86/64.h

@@ -42,9 +42,9 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_X86_64_NAME "Intel x86-64"
 
-#include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86_64,BOOST_ARCH_X86_64_NAME)
-
 #include <boost/predef/architecture/x86.h>
 
 #endif
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86_64,BOOST_ARCH_X86_64_NAME)

include/boost/predef/architecture/z.h

@@ -36,8 +36,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ARCH_Z_NAME "z/Architecture"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_Z,BOOST_ARCH_Z_NAME)
-
-
-#endif

include/boost/predef/compiler.h

@@ -1,12 +1,14 @@
 /*
-Copyright Rene Rivera 2008-2013
+Copyright Rene Rivera 2008-2015
 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)
 */
 
+#if !defined(BOOST_PREDEF_COMPILER_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
 #ifndef BOOST_PREDEF_COMPILER_H
 #define BOOST_PREDEF_COMPILER_H
+#endif
 
 #include <boost/predef/compiler/borland.h>
 #include <boost/predef/compiler/clang.h>

include/boost/predef/compiler/borland.h

@@ -52,6 +52,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_BORLAND_NAME "Borland C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND,BOOST_COMP_BORLAND_NAME)
 
@@ -59,6 +61,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND,BOOST_COMP_BORLAND_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND_EMULATED,BOOST_COMP_BORLAND_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/clang.h

@@ -45,6 +45,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_CLANG_NAME "Clang"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG,BOOST_COMP_CLANG_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG,BOOST_COMP_CLANG_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG_EMULATED,BOOST_COMP_CLANG_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/comeau.h

@@ -50,6 +50,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_COMO_NAME "Comeau C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO,BOOST_COMP_COMO_NAME)
 
@@ -57,6 +59,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO,BOOST_COMP_COMO_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO_EMULATED,BOOST_COMP_COMO_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/compaq.h

@@ -55,6 +55,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_DEC_NAME "Compaq C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC,BOOST_COMP_DEC_NAME)
 
@@ -62,6 +64,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC,BOOST_COMP_DEC_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC_EMULATED,BOOST_COMP_DEC_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/diab.h

@@ -45,6 +45,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_DIAB_NAME "Diab C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB,BOOST_COMP_DIAB_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB,BOOST_COMP_DIAB_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB_EMULATED,BOOST_COMP_DIAB_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/digitalmars.h

@@ -45,6 +45,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_DMC_NAME "Digital Mars"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC,BOOST_COMP_DMC_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC,BOOST_COMP_DMC_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC_EMULATED,BOOST_COMP_DMC_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/dignus.h

@@ -45,6 +45,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_SYSC_NAME "Dignus Systems/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC,BOOST_COMP_SYSC_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC,BOOST_COMP_SYSC_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC_EMULATED,BOOST_COMP_SYSC_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/edg.h

@@ -45,6 +45,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_EDG_NAME "EDG C++ Frontend"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG,BOOST_COMP_EDG_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG,BOOST_COMP_EDG_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG_EMULATED,BOOST_COMP_EDG_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/ekopath.h

@@ -46,6 +46,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_PATH_NAME "EKOpath"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH,BOOST_COMP_PATH_NAME)
 
@@ -53,6 +55,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH,BOOST_COMP_PATH_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH_EMULATED,BOOST_COMP_PATH_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/gcc.h

@@ -57,6 +57,8 @@ Version number available as major, minor, and patch (if available).
 
 #define BOOST_COMP_GNUC_NAME "Gnu GCC C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC,BOOST_COMP_GNUC_NAME)
 
@@ -64,6 +66,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC,BOOST_COMP_GNUC_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC_EMULATED,BOOST_COMP_GNUC_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/gcc_xml.h

@@ -42,6 +42,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_COMP_GCCXML_NAME "GCC XML"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML,BOOST_COMP_GCCXML_NAME)
 
@@ -49,5 +51,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML,BOOST_COMP_GCCXML_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML_EMULATED,BOOST_COMP_GCCXML_NAME)
 #endif
-
-#endif

include/boost/predef/compiler/greenhills.h

@@ -55,6 +55,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_GHS_NAME "Green Hills C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS,BOOST_COMP_GHS_NAME)
 
@@ -62,6 +64,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS,BOOST_COMP_GHS_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS_EMULATED,BOOST_COMP_GHS_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/hp_acc.h

@@ -50,6 +50,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_HPACC_NAME "HP aC++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC,BOOST_COMP_HPACC_NAME)
 
@@ -57,6 +59,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC,BOOST_COMP_HPACC_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC_EMULATED,BOOST_COMP_HPACC_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/iar.h

@@ -45,6 +45,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_IAR_NAME "IAR C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR,BOOST_COMP_IAR_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR,BOOST_COMP_IAR_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR_EMULATED,BOOST_COMP_IAR_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/ibm.h

@@ -61,6 +61,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_IBM_NAME "IBM XL C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM,BOOST_COMP_IBM_NAME)
 
@@ -68,6 +70,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM,BOOST_COMP_IBM_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM_EMULATED,BOOST_COMP_IBM_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/intel.h

@@ -54,6 +54,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_INTEL_NAME "Intel C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL,BOOST_COMP_INTEL_NAME)
 
@@ -61,6 +63,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL,BOOST_COMP_INTEL_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL_EMULATED,BOOST_COMP_INTEL_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/kai.h

@@ -45,6 +45,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_KCC_NAME "Kai C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC,BOOST_COMP_KCC_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC,BOOST_COMP_KCC_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC_EMULATED,BOOST_COMP_KCC_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/llvm.h

@@ -46,6 +46,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_COMP_LLVM_NAME "LLVM"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM,BOOST_COMP_LLVM_NAME)
 
@@ -53,6 +55,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM,BOOST_COMP_LLVM_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM_EMULATED,BOOST_COMP_LLVM_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/metaware.h

@@ -42,6 +42,8 @@ MetaWare High C/C++ compiler.
 
 #define BOOST_COMP_HIGHC_NAME "MetaWare High C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC,BOOST_COMP_HIGHC_NAME)
 
@@ -49,6 +51,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC,BOOST_COMP_HIGHC_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC_EMULATED,BOOST_COMP_HIGHC_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/metrowerks.h

@@ -66,6 +66,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_MWERKS_NAME "Metrowerks CodeWarrior"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS,BOOST_COMP_MWERKS_NAME)
 
@@ -73,6 +75,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS,BOOST_COMP_MWERKS_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS_EMULATED,BOOST_COMP_MWERKS_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/microtec.h

@@ -42,6 +42,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_COMP_MRI_NAME "Microtec C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI,BOOST_COMP_MRI_NAME)
 
@@ -49,6 +51,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI,BOOST_COMP_MRI_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI_EMULATED,BOOST_COMP_MRI_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/mpw.h

@@ -52,6 +52,8 @@ Version number available as major, and minor.
 
 #define BOOST_COMP_MPW_NAME "MPW C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW,BOOST_COMP_MPW_NAME)
 
@@ -59,6 +61,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW,BOOST_COMP_MPW_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW_EMULATED,BOOST_COMP_MPW_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/palm.h

@@ -45,6 +45,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_PALM_NAME "Palm C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM,BOOST_COMP_PALM_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM,BOOST_COMP_PALM_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM_EMULATED,BOOST_COMP_PALM_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/pgi.h

@@ -49,6 +49,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_COMP_PGI_NAME "Portland Group C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI,BOOST_COMP_PGI_NAME)
 
@@ -56,6 +58,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI,BOOST_COMP_PGI_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI_EMULATED,BOOST_COMP_PGI_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/sgi_mipspro.h

@@ -55,6 +55,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_SGI_NAME "SGI MIPSpro"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI,BOOST_COMP_SGI_NAME)
 
@@ -62,6 +64,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI,BOOST_COMP_SGI_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI_EMULATED,BOOST_COMP_SGI_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/sunpro.h

@@ -65,6 +65,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_SUNPRO_NAME "Oracle Solaris Studio"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME)
 
@@ -72,6 +74,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO_EMULATED,BOOST_COMP_SUNPRO_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/tendra.h

@@ -42,6 +42,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_COMP_TENDRA_NAME "TenDRA C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA,BOOST_COMP_TENDRA_NAME)
 
@@ -49,6 +51,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA,BOOST_COMP_TENDRA_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA_EMULATED,BOOST_COMP_TENDRA_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/visualc.h

@@ -80,6 +80,8 @@ Version number available as major, minor, and patch.
 
 #define BOOST_COMP_MSVC_NAME "Microsoft Visual C/C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC,BOOST_COMP_MSVC_NAME)
 
@@ -87,6 +89,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC,BOOST_COMP_MSVC_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC_EMULATED,BOOST_COMP_MSVC_NAME)
 #endif
-
-
-#endif

include/boost/predef/compiler/watcom.h

@@ -45,6 +45,8 @@ Version number available as major, and minor.
 
 #define BOOST_COMP_WATCOM_NAME "Watcom C++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM,BOOST_COMP_WATCOM_NAME)
 
@@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM,BOOST_COMP_WATCOM_NAME)
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM_EMULATED,BOOST_COMP_WATCOM_NAME)
 #endif
-
-
-#endif

include/boost/predef/detail/test_def.h

@@ -0,0 +1,71 @@
+/*
+Copyright Rene Rivera 2011-2015
+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)
+*/
+#include <boost/predef.h>
+
+#define BOOST_PREDEF_INTERNAL_GENERATE_TESTS
+
+void * add_predef_entry(const char * name, const char * description, unsigned value);
+#undef BOOST_PREDEF_DECLARE_TEST
+#define BOOST_PREDEF_DECLARE_TEST(x,s) void predef_entry_##x() { add_predef_entry(#x, s, x); }
+#include <boost/predef.h>
+
+#undef BOOST_PREDEF_DECLARE_TEST
+#define BOOST_PREDEF_DECLARE_TEST(x,s) predef_entry_##x();
+void create_predef_entries()
+{
+#include <boost/predef.h>
+}
+
+#ifdef __cplusplus
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+using namespace std;
+#else
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#endif
+
+typedef struct predef_info
+{
+    const char * name;
+    const char * description;
+    unsigned value;
+} predef_info;
+
+#ifdef __cplusplus
+using namespace std;
+#endif
+
+unsigned generated_predef_info_count = 0;
+predef_info* generated_predef_info = 0;
+void * add_predef_entry(const char * name, const char * description, unsigned value)
+{
+    if (0 == generated_predef_info_count)
+    {
+        generated_predef_info_count = 1;
+        generated_predef_info = (predef_info*)malloc(sizeof(predef_info));
+    }
+    else
+    {
+        generated_predef_info_count += 1;
+        generated_predef_info = (predef_info*)realloc(generated_predef_info,
+            generated_predef_info_count*sizeof(predef_info));
+    }
+    generated_predef_info[generated_predef_info_count-1].name = name;
+    generated_predef_info[generated_predef_info_count-1].description = description;
+    generated_predef_info[generated_predef_info_count-1].value = value;
+    return 0;
+}
+
+int predef_info_compare(const void * a, const void * b)
+{
+    const predef_info * i = (const predef_info *)a;
+    const predef_info * j = (const predef_info *)b;
+    return strcmp(i->name,j->name);
+}

include/boost/predef/language.h

@@ -1,12 +1,14 @@
 /*
-Copyright Rene Rivera 2011-2012
+Copyright Rene Rivera 2011-2015
 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)
 */
 
+#if !defined(BOOST_PREDEF_LANGUAGE_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
 #ifndef BOOST_PREDEF_LANGUAGE_H
 #define BOOST_PREDEF_LANGUAGE_H
+#endif
 
 #include <boost/predef/language/stdc.h>
 #include <boost/predef/language/stdcpp.h>

include/boost/predef/language/objc.h

@@ -36,8 +36,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_LANG_OBJC_NAME "Objective-C"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_OBJC,BOOST_LANG_OBJC_NAME)
-
-
-#endif

include/boost/predef/language/stdc.h

@@ -47,8 +47,7 @@ If available, the year of the standard is detected as YYYY.MM.1 from the Epoc da
 
 #define BOOST_LANG_STDC_NAME "Standard C"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDC,BOOST_LANG_STDC_NAME)
-
-
-#endif

include/boost/predef/language/stdcpp.h

@@ -52,10 +52,6 @@ Specifically the defined versions are:
 
 #define BOOST_LANG_STDCPP_NAME "Standard C++"
 
-#include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPP,BOOST_LANG_STDCPP_NAME)
-
-
 /*`
 [heading `BOOST_LANG_STDCPPCLI`]
 
@@ -88,10 +84,6 @@ If available, the year of the standard is detected as YYYY.MM.1 from the Epoc da
 
 #define BOOST_LANG_STDCPPCLI_NAME "Standard C++/CLI"
 
-#include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPPCLI,BOOST_LANG_STDCPPCLI_NAME)
-
-
 /*`
 [heading `BOOST_LANG_STDECPP`]
 
@@ -117,8 +109,13 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPPCLI,BOOST_LANG_STDCPPCLI_NAME)
 
 #define BOOST_LANG_STDECPP_NAME "Standard Embedded C++"
 
+#endif
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPP,BOOST_LANG_STDCPP_NAME)
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPPCLI,BOOST_LANG_STDCPPCLI_NAME)
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDECPP,BOOST_LANG_STDECPP_NAME)
-
-
-#endif

include/boost/predef/library.h

@@ -1,12 +1,14 @@
 /*
-Copyright Rene Rivera 2008-2012
+Copyright Rene Rivera 2008-2015
 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)
 */
 
+#if !defined(BOOST_PREDEF_LIBRARY_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
 #ifndef BOOST_PREDEF_LIBRARY_H
 #define BOOST_PREDEF_LIBRARY_H
+#endif
 
 #include <boost/predef/library/c.h>
 #include <boost/predef/library/std.h>

include/boost/predef/library/c.h

@@ -1,12 +1,14 @@
 /*
-Copyright Rene Rivera 2008-2012
+Copyright Rene Rivera 2008-2015
 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)
 */
 
+#if !defined(BOOST_PREDEF_LIBRARY_C_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
 #ifndef BOOST_PREDEF_LIBRARY_C_H
 #define BOOST_PREDEF_LIBRARY_C_H
+#endif
 
 #include <boost/predef/library/c/_prefix.h>
 

include/boost/predef/library/c/gnu.h

@@ -55,8 +55,7 @@ Version number available as major, and minor.
 
 #define BOOST_LIB_C_GNU_NAME "GNU"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_GNU,BOOST_LIB_C_GNU_NAME)
-
-
-#endif

include/boost/predef/library/c/uc.h

@@ -41,8 +41,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_LIB_C_UC_NAME "uClibc"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_UC,BOOST_LIB_C_UC_NAME)
-
-
-#endif

include/boost/predef/library/c/vms.h

@@ -41,8 +41,7 @@ Version number available as major, minor, and patch.
 
 #define BOOST_LIB_C_VMS_NAME "VMS"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_VMS,BOOST_LIB_C_VMS_NAME)
-
-
-#endif

include/boost/predef/library/c/zos.h

@@ -50,8 +50,7 @@ Version number available as major, minor, and patch.
 
 #define BOOST_LIB_C_ZOS_NAME "z/OS"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_ZOS,BOOST_LIB_C_ZOS_NAME)
-
-
-#endif

include/boost/predef/library/std.h

@@ -1,11 +1,13 @@
 /*
-Copyright Rene Rivera 2008-2013
+Copyright Rene Rivera 2008-2015
 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)
 */
+#if !defined(BOOST_PREDEF_LIBRARY_STD_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
 #ifndef BOOST_PREDEF_LIBRARY_STD_H
 #define BOOST_PREDEF_LIBRARY_STD_H
+#endif
 
 #include <boost/predef/library/std/_prefix.h>
 

include/boost/predef/library/std/cxx.h

@@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_LIB_STD_CXX_NAME "libc++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_CXX,BOOST_LIB_STD_CXX_NAME)
-
-
-#endif

include/boost/predef/library/std/dinkumware.h

@@ -46,8 +46,7 @@ If available version number as major, minor, and patch.
 
 #define BOOST_LIB_STD_DINKUMWARE_NAME "Dinkumware"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_DINKUMWARE,BOOST_LIB_STD_DINKUMWARE_NAME)
-
-
-#endif

include/boost/predef/library/std/libcomo.h

@@ -41,8 +41,7 @@ Version number available as major.
 
 #define BOOST_LIB_STD_COMO_NAME "Comeau Computing"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_COMO,BOOST_LIB_STD_COMO_NAME)
-
-
-#endif

include/boost/predef/library/std/modena.h

@@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_LIB_STD_MSIPL_NAME "Modena Software Lib++"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_MSIPL,BOOST_LIB_STD_MSIPL_NAME)
-
-
-#endif

include/boost/predef/library/std/msl.h

@@ -47,8 +47,7 @@ Version number available as major, minor, and patch.
 
 #define BOOST_LIB_STD_MSL_NAME "Metrowerks"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_MSL,BOOST_LIB_STD_MSL_NAME)
-
-
-#endif

include/boost/predef/library/std/roguewave.h

@@ -50,8 +50,7 @@ If available version number as major, minor, and patch.
 
 #define BOOST_LIB_STD_RW_NAME "Roguewave"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_RW,BOOST_LIB_STD_RW_NAME)
-
-
-#endif

include/boost/predef/library/std/sgi.h

@@ -45,8 +45,7 @@ If available version number as major, minor, and patch.
 
 #define BOOST_LIB_STD_SGI_NAME "SGI"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_SGI,BOOST_LIB_STD_SGI_NAME)
-
-
-#endif

include/boost/predef/library/std/stdcpp3.h

@@ -47,8 +47,7 @@ Version number available as year (from 1970), month, and day.
 
 #define BOOST_LIB_STD_GNU_NAME "GNU"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_GNU,BOOST_LIB_STD_GNU_NAME)
-
-
-#endif

include/boost/predef/library/std/stlport.h

@@ -53,8 +53,7 @@ Version number available as major, minor, and patch.
 
 #define BOOST_LIB_STD_STLPORT_NAME "STLport"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_STLPORT,BOOST_LIB_STD_STLPORT_NAME)
-
-
-#endif

include/boost/predef/library/std/vacpp.h

@@ -38,8 +38,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_LIB_STD_IBM_NAME "IBM VACPP"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_IBM,BOOST_LIB_STD_IBM_NAME)
-
-
-#endif

include/boost/predef/os.h

@@ -1,13 +1,15 @@
 /*
-Copyright Rene Rivera 2008-2012
+Copyright Rene Rivera 2008-2015
 Copyright Franz Detro 2014
 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)
 */
 
+#if !defined(BOOST_PREDEF_OS_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
 #ifndef BOOST_PREDEF_OS_H
 #define BOOST_PREDEF_OS_H
+#endif
 
 #include <boost/predef/os/aix.h>
 #include <boost/predef/os/amigaos.h>

include/boost/predef/os/aix.h

@@ -60,8 +60,7 @@ Version number available as major, minor, and patch.
 
 #define BOOST_OS_AIX_NAME "IBM AIX"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AIX,BOOST_OS_AIX_NAME)
-
-
-#endif

include/boost/predef/os/amigaos.h

@@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_AMIGAOS_NAME "AmigaOS"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AMIGAOS,BOOST_OS_AMIGAOS_NAME)
-
-
-#endif

include/boost/predef/os/android.h

@@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_ANDROID_NAME "Android"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_ANDROID,BOOST_OS_ANDROID_NAME)
-
-
-#endif

include/boost/predef/os/beos.h

@@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_BEOS_NAME "BeOS"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BEOS,BOOST_OS_BEOS_NAME)
-
-
-#endif

include/boost/predef/os/bsd.h

@@ -89,7 +89,15 @@ of BSD. If the above variants is detected the corresponding macro is also set.]
 
 #define BOOST_OS_BSD_NAME "BSD"
 
-#include <boost/predef/detail/test.h>
+#else
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,BOOST_OS_BSD_NAME)
+
+#include <boost/predef/os/bsd/bsdi.h>
+#include <boost/predef/os/bsd/dragonfly.h>
+#include <boost/predef/os/bsd/free.h>
+#include <boost/predef/os/bsd/open.h>
+#include <boost/predef/os/bsd/net.h>
 
 #endif
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,BOOST_OS_BSD_NAME)

include/boost/predef/os/bsd/bsdi.h

@@ -42,7 +42,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_BSD_BSDI_NAME "BSDi BSD/OS"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_BSDI,BOOST_OS_BSD_BSDI_NAME)
-
-#endif

include/boost/predef/os/bsd/dragonfly.h

@@ -44,7 +44,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_BSD_DRAGONFLY_NAME "DragonFly BSD"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_DRAGONFLY,BOOST_OS_BSD_DRAGONFLY_NAME)
-
-#endif

include/boost/predef/os/bsd/free.h

@@ -54,7 +54,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_BSD_FREE_NAME "Free BSD"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_FREE,BOOST_OS_BSD_FREE_NAME)
-
-#endif

include/boost/predef/os/bsd/net.h

@@ -78,7 +78,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_BSD_NET_NAME "DragonFly BSD"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_NET,BOOST_OS_BSD_NET_NAME)
-
-#endif

include/boost/predef/os/bsd/open.h

@@ -165,7 +165,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_BSD_OPEN_NAME "OpenBSD"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_OPEN,BOOST_OS_BSD_OPEN_NAME)
-
-#endif

include/boost/predef/os/cygwin.h

@@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_CYGWIN_NAME "Cygwin"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_CYGWIN,BOOST_OS_CYGWIN_NAME)
-
-
-#endif

include/boost/predef/os/haiku.h

@@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_HAIKU_NAME "Haiku"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_HAIKU,BOOST_OS_HAIKU_NAME)
-
-
-#endif

include/boost/predef/os/hpux.h

@@ -41,8 +41,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_HPUX_NAME "HP-UX"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_HPUX,BOOST_OS_HPUX_NAME)
-
-
-#endif

include/boost/predef/os/ios.h

@@ -44,8 +44,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_IOS_NAME "iOS"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IOS,BOOST_OS_IOS_NAME)
-
-
-#endif

include/boost/predef/os/irix.h

@@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_IRIX_NAME "IRIX"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IRIX,BOOST_OS_IRIX_NAME)
-
-
-#endif

include/boost/predef/os/linux.h

@@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_LINUX_NAME "Linux"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_LINUX,BOOST_OS_LINUX_NAME)
-
-
-#endif

include/boost/predef/os/macos.h

@@ -59,8 +59,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_MACOS_NAME "Mac OS"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,BOOST_OS_MACOS_NAME)
-
-
-#endif

include/boost/predef/os/os400.h

@@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_OS400_NAME "IBM OS/400"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_OS400,BOOST_OS_OS400_NAME)
-
-
-#endif

include/boost/predef/os/qnxnto.h

@@ -53,8 +53,7 @@ version 4 is specifically detected.
 
 #define BOOST_OS_QNX_NAME "QNX"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_QNX,BOOST_OS_QNX_NAME)
-
-
-#endif

include/boost/predef/os/solaris.h

@@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_SOLARIS_NAME "Solaris"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_SOLARIS,BOOST_OS_SOLARIS_NAME)
-
-
-#endif

include/boost/predef/os/unix.h

@@ -69,8 +69,8 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_OS_SVR4_NAME "SVR4 Environment"
 
+#endif
+
 #include <boost/predef/detail/test.h>
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_UNIX,BOOST_OS_UNIX_NAME)
 BOOST_PREDEF_DECLARE_TEST(BOOST_OS_SVR4,BOOST_OS_SVR4_NAME)
-
-#endif