Merge pull request #27 from boostorg/develop

Merge for 1.3 release.

.travis.yml

@@ -0,0 +1,47 @@
+language: cpp
+
+branches:
+  only:
+    - develop
+
+notifications:
+  email:
+    recipients:
+      - grafikrobot@gmail.com
+    on_success: change
+    on_failure: change
+  irc:
+    channels:
+      - "chat.freenode.net#boost"
+    template:
+      - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
+    on_success: change
+    on_failure: change
+
+os:
+  - linux
+
+matrix:
+  include:
+    - compiler: clang
+      env: TOOLSET=clang-3.4
+    - compiler: clang
+      env: TOOLSET=clang-3.5
+    - compiler: clang
+      env: TOOLSET=clang-3.6
+    - compiler: gcc
+      env: TOOLSET=gcc-4.7
+    - compiler: gcc
+      env: TOOLSET=gcc-4.8
+    - compiler: gcc
+      env: TOOLSET=gcc-4.9
+    - compiler: gcc
+      env: TOOLSET=gcc-5.1
+
+before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py"
+install: python script.py install
+before_script: python script.py before_script
+script: python script.py script
+after_success: python script.py after_success
+after_failure: python script.py after_failure
+after_script: python script.py after_script

appveyor.yml

@@ -0,0 +1,46 @@
+branches:
+  only:
+    - develop
+
+skip_tags: true
+
+notifications:
+  - provider: Email
+    to:
+      - grafikrobot@gmail.com
+    on_build_status_changed: true
+
+environment:
+  matrix:
+  - TOOLSET: vs-2008
+    platform: 32
+  - TOOLSET: vs-2010
+    platform: 32
+  - TOOLSET: vs-2012
+    platform: 32
+  - TOOLSET: vs-2012
+    platform: 64
+  - TOOLSET: vs-2013
+    platform: 32
+  - TOOLSET: vs-2013
+    platform: 64
+
+configuration:
+  - debug
+  - release
+
+init:
+  - cd %APPVEYOR_BUILD_FOLDER%/..
+  - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py"
+  - dir
+  - cd %APPVEYOR_BUILD_FOLDER%
+install: python ../script.py install
+before_build: python ../script.py before_build
+build_script: python ../script.py build_script
+after_build: python ../script.py after_build
+before_test: python ../script.py before_test
+test_script: python ../script.py test_script
+after_test: python ../script.py after_test
+on_success: python ../script.py on_success
+on_failure: python ../script.py on_failure
+on_finish: python ../script.py on_finish

check/predef.jam

@@ -13,6 +13,7 @@ import string ;
 import toolset ;
 import modules ;
 import path ;
+import "class" : new ;
 
 # Create a project for our targets.
 project.extension predef check ;
@@ -54,35 +55,42 @@ rule check ( expressions + : language ? : true-properties * : false-properties *
     
     local project_target = [ project.target $(__name__) ] ;
 	project.push-current $(project_target) ;
+    local terms ;
     local result ;
     for expression in $(expressions)
     {
-        # The check program to use.
+        if $(expression:L) in "and" "or"
-        local exe_target = [ $(_check_exe_($(language))).name ] ;
-        exe_target = /check/predef//$(exe_target) ;
-        
-        # Create the check run if we don't have one yet.
-        local key = [ MD5 $(language)::$(expression) ] ;
-        if ! ( $(key) in $(_checks_) )
         {
-            _checks_ += $(key) ;
+            terms += $(expression:L) ;
-            make
+        }
-                $(key).txt :
+        else
-                $(exe_target) :
+        {
-                @$(__name__).predef_check_action :
+            # The check program to use.
-                <predef-expression>$(expression) ;
+            local exe_target = [ $(_check_exe_($(language))).name ] ;
-            explicit
+            exe_target = /check/predef//$(exe_target) ;
-                $(key).txt ;
+            
+            # Create the check run if we don't have one yet.
+            local key = [ MD5 $(language)::$(expression) ] ;
+            if ! ( $(key) in $(_checks_) )
+            {
+                _checks_ += $(key) ;
+                _message_(/check/predef//$(key).txt) = $(expression) ;
+                make
+                    $(key).txt :
+                    $(exe_target) :
+                    @$(__name__).predef_check_action :
+                    <predef-expression>$(expression) ;
+                explicit
+                    $(key).txt ;
+            }
+            
+            terms += /check/predef//$(key).txt ;
         }
-        
-        local check_target = [ check-target-builds
-            /check/predef//$(key).txt $(expression)
-            : $(true-properties)
-            : $(false-properties) ] ;
-        
-        result += $(check_target) ;
     }
-	project.pop-current ;
+    local instance = [ new check-expression-evaluator
+        $(terms) : $(true-properties) : $(false-properties) ] ;
+    result = <conditional>@$(instance).check ;
+    project.pop-current ;
     return $(result) ;
 }
 
@@ -104,3 +112,95 @@ actions predef_check_action bind PREDEF_CHECK_EXPRESSION
 {
     $(>) "$(PREDEF_CHECK_EXPRESSION)" > $(<)
 }
+
+class check-expression-evaluator
+{
+    import configure ;
+    
+    rule __init__ ( expression + : true-properties * : false-properties * )
+    {
+        self.expression = $(expression) ;
+        self.true-properties = $(true-properties) ;
+        self.false-properties = $(false-properties) ;
+    }
+    
+    rule check ( properties * )
+    {
+        local to-eval ;
+        local tokens = "and" "or" ;
+        # Go through the expression and: eval the target values,
+        # and normalize to a full expression.
+        for local term in $(self.expression)
+        {
+            if ! ( $(term:L) in $(tokens) )
+            {
+                # A value is a target reference that will evan to "true"
+                # or "false".
+                if $(to-eval[-1]:L) && ! ( $(to-eval[-1]:L) in $(tokens) )
+                {
+                    # Default to "and" operation.
+                    to-eval += "and" ;
+                }
+                local message = [ modules.peek predef : _message_($(term)) ] ;
+                if [ configure.builds $(term) : $(properties) : $(message) ]
+                {
+                    to-eval += "true" ;
+                }
+                else
+                {
+                    to-eval += "false" ;
+                }
+            }
+            else
+            {
+                to-eval += $(term) ;
+            }
+        }
+        # Eval full the expression.
+        local eval-result = [ eval $(to-eval) ] ;
+        # And resolve true/false properties.
+        if $(eval-result) = "true"
+        {
+            return $(self.true-properties) ;
+        }
+        else
+        {
+            return $(self.false-properties) ;
+        }
+    }
+    
+    rule eval ( e * )
+    {
+        local r ;
+        if $(e[1]) && $(e[2]) && $(e[3])
+        {
+            if $(e[2]) = "and"
+            {
+                if $(e[1]) = "true" && $(e[3]) = "true"
+                {
+                    r = [ eval "true" $(e[4-]) ] ;
+                }
+                else
+                {
+                    r = [ eval "false" $(e[4-]) ] ;
+                }
+            }
+            else if $(e[2]) = "or"
+            {
+                if $(e[1]) = "true" || $(e[3]) = "true"
+                {
+                    r = [ eval "true" $(e[4-]) ] ;
+                }
+                else
+                {
+                    r = [ eval "false" $(e[4-]) ] ;
+                }
+            }
+        }
+        else
+        {
+            r = $(e[1]) ;
+        }
+        return $(r) ;
+    }
+}

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"

doc/history.qbk

@@ -7,6 +7,15 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 [section History]
 
+[heading 1.3]
+
+* Fix many problems with `predef_check` functionality.
+* Update SunPro detection to accomodate latest version of compiler from Oracle.
+* Addition of Travis-CI and Appveyor testing.
+* Add `and` and `or` logical operators for `predef_check` expression on the Boost Build side.
+* Fix `BOOST_ARCH_PARISC` to correctly spelled name (from Graham Hanson).
+* Fix `MAKE_YYYYM` macros to correctly limit the month (from rick68).
+
 [heading 1.2]
 
 * Account for skip in Visual Studio product version vs. compiler version.

doc/html/boostbook.css

@@ -289,6 +289,22 @@ Tables
         border: none !important;
     }
 
+/*=============================================================================
+Suppress margins in tables
+=============================================================================*/
+
+    table th > *:first-child,
+    table td > *:first-child
+    {
+        margin-top: 0;
+    }
+
+    table th > *:last-child,
+    table td > *:last-child
+    {
+        margin-bottom: 0;
+    }
+
 /*=============================================================================
 Blurbs
 =============================================================================*/

doc/html/index.html

@@ -1,10 +1,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Predef 1.2</title>
+<title>Predef 1.3</title>
 <link rel="stylesheet" href="boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Predef 1.2">
+<link rel="home" href="index.html" title="Predef 1.3">
 <link rel="next" href="predef/introduction.html" title="Introduction">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -13,11 +13,12 @@
 <div class="titlepage">
 <div>
 <div><h2 class="title">
-<a name="predef"></a>Predef 1.2</h2></div>
+<a name="predef"></a>Predef 1.3</h2></div>
 <div><div class="authorgroup"><div class="author"><h3 class="author">
 <span class="firstname">Rene</span> <span class="surname">Rivera</span>
 </h3></div></div></div>
-<div><p class="copyright">Copyright &#169; 2005, 2008-2014 Rene Rivera</p></div>
+<div><p class="copyright">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera</p></div>
 <div><div class="legalnotice">
 <a name="predef.legal"></a><p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -53,7 +54,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: January 29, 2015 at 21:39:36 GMT</small></p></td>
+<td align="left"><p><small>Last revised: July 01, 2015 at 22:17:15 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

doc/html/predef/acknoledgements.html

@@ -4,8 +4,8 @@
 <title>Acknoledgements</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Predef 1.2">
+<link rel="home" href="../index.html" title="Predef 1.3">
-<link rel="up" href="../index.html" title="Predef 1.2">
+<link rel="up" href="../index.html" title="Predef 1.3">
 <link rel="prev" href="to_do.html" title="To Do">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,7 +35,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/adding_new_predefs.html

@@ -4,8 +4,8 @@
 <title>Adding new predefs</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Predef 1.2">
+<link rel="home" href="../index.html" title="Predef 1.3">
-<link rel="up" href="../index.html" title="Predef 1.2">
+<link rel="up" href="../index.html" title="Predef 1.3">
 <link rel="prev" href="using_the_predefs.html" title="Using the predefs">
 <link rel="next" href="reference.html" title="Reference">
 </head>
@@ -289,7 +289,8 @@ Documentation about what is detected.
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/check_utilities.html

@@ -4,8 +4,8 @@
 <title>Check Utilities</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Predef 1.2">
+<link rel="home" href="../index.html" title="Predef 1.3">
-<link rel="up" href="../index.html" title="Predef 1.2">
+<link rel="up" href="../index.html" title="Predef 1.3">
 <link rel="prev" href="reference/version_definition_macros.html" title="Version definition macros">
 <link rel="next" href="history.html" title="History">
 </head>
@@ -102,6 +102,17 @@ lib my_special_lib : source.cpp
     return [ check $(expressions) : $(language) : : &lt;build&gt;no ] ;
 }
 </pre>
+<p>
+      The expression can also use explicit "and", "or" logical
+      operators to for more complex checks:
+    </p>
+<pre class="programlisting">import path-to-predef-src/check/predef
+    : check require
+    : predef-check predef-require ;
+
+lib my_special_lib : source.cpp
+    : [ predef-require "BOOST_OS_WINDOWS" or "BOOST_OS_VMS"] ;
+</pre>
 <p>
       You can use the <code class="literal">check</code> rule for more control and to implement
       something other than control of what gets built. The definition for the <code class="literal">check</code>
@@ -122,7 +133,7 @@ lib my_special_lib : source.cpp
 
 exe my_special_exe : source.cpp
     : [ predef-check "BOOST_OS_WINDOWS == 0"
-        : &lt;define&gt;ENABLE_WMF=0
+        : : &lt;define&gt;ENABLE_WMF=0
         : &lt;define&gt;ENABLE_WMF=1 ] ;
 </pre>
 <p>
@@ -134,7 +145,8 @@ exe my_special_exe : source.cpp
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/history.html

@@ -4,8 +4,8 @@
 <title>History</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Predef 1.2">
+<link rel="home" href="../index.html" title="Predef 1.3">
-<link rel="up" href="../index.html" title="Predef 1.2">
+<link rel="up" href="../index.html" title="Predef 1.3">
 <link rel="prev" href="check_utilities.html" title="Check Utilities">
 <link rel="next" href="to_do.html" title="To Do">
 </head>
@@ -19,6 +19,34 @@
 </h2></div></div></div>
 <h4>
 <a name="predef.history.h0"></a>
+      <span class="phrase"><a name="predef.history.1_3"></a></span><a class="link" href="history.html#predef.history.1_3">1.3</a>
+    </h4>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+          Fix many problems with <code class="computeroutput"><span class="identifier">predef_check</span></code>
+          functionality.
+        </li>
+<li class="listitem">
+          Update SunPro detection to accomodate latest version of compiler from Oracle.
+        </li>
+<li class="listitem">
+          Addition of Travis-CI and Appveyor testing.
+        </li>
+<li class="listitem">
+          Add <code class="computeroutput"><span class="keyword">and</span></code> and <code class="computeroutput"><span class="keyword">or</span></code> logical operators for <code class="computeroutput"><span class="identifier">predef_check</span></code>
+          expression on the Boost Build side.
+        </li>
+<li class="listitem">
+          Fix <code class="computeroutput"><span class="identifier">BOOST_ARCH_PARISC</span></code> to
+          correctly spelled name (from Graham Hanson).
+        </li>
+<li class="listitem">
+          Fix <code class="computeroutput"><span class="identifier">MAKE_YYYYM</span></code> macros to
+          correctly limit the month (from rick68).
+        </li>
+</ul></div>
+<h4>
+<a name="predef.history.h1"></a>
       <span class="phrase"><a name="predef.history.1_2"></a></span><a class="link" href="history.html#predef.history.1_2">1.2</a>
     </h4>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -42,7 +70,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="predef.history.h1"></a>
+<a name="predef.history.h2"></a>
       <span class="phrase"><a name="predef.history.1_1"></a></span><a class="link" href="history.html#predef.history.1_1">1.1</a>
     </h4>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -84,7 +112,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/introduction.html

@@ -4,9 +4,9 @@
 <title>Introduction</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Predef 1.2">
+<link rel="home" href="../index.html" title="Predef 1.3">
-<link rel="up" href="../index.html" title="Predef 1.2">
+<link rel="up" href="../index.html" title="Predef 1.3">
-<link rel="prev" href="../index.html" title="Predef 1.2">
+<link rel="prev" href="../index.html" title="Predef 1.3">
 <link rel="next" href="using_the_predefs.html" title="Using the predefs">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -191,7 +191,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference.html

@@ -4,8 +4,8 @@
 <title>Reference</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Predef 1.2">
+<link rel="home" href="../index.html" title="Predef 1.3">
-<link rel="up" href="../index.html" title="Predef 1.2">
+<link rel="up" href="../index.html" title="Predef 1.3">
 <link rel="prev" href="adding_new_predefs.html" title="Adding new predefs">
 <link rel="next" href="reference/boost_arch_architecture_macros.html" title="BOOST_ARCH architecture macros">
 </head>
@@ -31,7 +31,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference/boost_arch_architecture_macros.html

@@ -4,7 +4,7 @@
 <title>BOOST_ARCH architecture macros</title>
 <link rel="stylesheet" href="../../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Predef 1.2">
+<link rel="home" href="../../index.html" title="Predef 1.3">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="../reference.html" title="Reference">
 <link rel="next" href="boost_comp_compiler_macros.html" title="BOOST_COMP compiler macros">
@@ -2137,7 +2137,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference/boost_comp_compiler_macros.html

@@ -4,7 +4,7 @@
 <title>BOOST_COMP compiler macros</title>
 <link rel="stylesheet" href="../../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Predef 1.2">
+<link rel="home" href="../../index.html" title="Predef 1.3">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="boost_arch_architecture_macros.html" title="BOOST_ARCH architecture macros">
 <link rel="next" href="boost_lang_language_standards_ma.html" title="BOOST_LANG language standards macros">
@@ -1537,8 +1537,8 @@
         <span class="phrase"><a name="predef.reference.boost_comp_compiler_macros.boost_comp_sunpro"></a></span><a class="link" href="boost_comp_compiler_macros.html#predef.reference.boost_comp_compiler_macros.boost_comp_sunpro"><code class="computeroutput"><span class="identifier">BOOST_COMP_SUNPRO</span></code></a>
       </h5>
 <p>
-        <a href="http://en.wikipedia.org/wiki/Sun_Studio_%28software%29" target="_top">Sun Studio</a>
+        <a href="http://en.wikipedia.org/wiki/Oracle_Solaris_Studio" target="_top">Oracle Solaris
-        compiler. Version number available as major, minor, and patch.
+        Studio</a> compiler. Version number available as major, minor, and patch.
       </p>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -1606,6 +1606,30 @@
                 </p>
               </td>
 </tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">__SUNPRO_CC</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  VV.RR.P
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">__SUNPRO_C</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  VV.RR.P
+                </p>
+              </td>
+</tr>
 </tbody>
 </table></div>
 <h5>
@@ -1765,7 +1789,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference/boost_lang_language_standards_ma.html

@@ -4,7 +4,7 @@
 <title>BOOST_LANG language standards macros</title>
 <link rel="stylesheet" href="../../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Predef 1.2">
+<link rel="home" href="../../index.html" title="Predef 1.3">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="boost_comp_compiler_macros.html" title="BOOST_COMP compiler macros">
 <link rel="next" href="boost_lib_library_macros.html" title="BOOST_LIB library macros">
@@ -320,7 +320,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference/boost_lib_library_macros.html

@@ -4,7 +4,7 @@
 <title>BOOST_LIB library macros</title>
 <link rel="stylesheet" href="../../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Predef 1.2">
+<link rel="home" href="../../index.html" title="Predef 1.3">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="boost_lang_language_standards_ma.html" title="BOOST_LANG language standards macros">
 <link rel="next" href="boost_os_operating_system_macros.html" title="BOOST_OS operating system macros">
@@ -882,7 +882,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference/boost_os_operating_system_macros.html

@@ -4,7 +4,7 @@
 <title>BOOST_OS operating system macros</title>
 <link rel="stylesheet" href="../../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Predef 1.2">
+<link rel="home" href="../../index.html" title="Predef 1.3">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="boost_lib_library_macros.html" title="BOOST_LIB library macros">
 <link rel="next" href="boost_plat_platform_macros.html" title="BOOST_PLAT platform macros">
@@ -1906,7 +1906,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference/boost_plat_platform_macros.html

@@ -4,7 +4,7 @@
 <title>BOOST_PLAT platform macros</title>
 <link rel="stylesheet" href="../../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Predef 1.2">
+<link rel="home" href="../../index.html" title="Predef 1.3">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="boost_os_operating_system_macros.html" title="BOOST_OS operating system macros">
 <link rel="next" href="other_macros.html" title="Other macros">
@@ -262,7 +262,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference/other_macros.html

@@ -4,7 +4,7 @@
 <title>Other macros</title>
 <link rel="stylesheet" href="../../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Predef 1.2">
+<link rel="home" href="../../index.html" title="Predef 1.3">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="boost_plat_platform_macros.html" title="BOOST_PLAT platform macros">
 <link rel="next" href="version_definition_macros.html" title="Version definition macros">
@@ -70,7 +70,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/reference/version_definition_macros.html

@@ -4,7 +4,7 @@
 <title>Version definition macros</title>
 <link rel="stylesheet" href="../../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../../index.html" title="Predef 1.2">
+<link rel="home" href="../../index.html" title="Predef 1.3">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="other_macros.html" title="Other macros">
 <link rel="next" href="../check_utilities.html" title="Check Utilities">
@@ -173,7 +173,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/to_do.html

@@ -4,8 +4,8 @@
 <title>To Do</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Predef 1.2">
+<link rel="home" href="../index.html" title="Predef 1.3">
-<link rel="up" href="../index.html" title="Predef 1.2">
+<link rel="up" href="../index.html" title="Predef 1.3">
 <link rel="prev" href="history.html" title="History">
 <link rel="next" href="acknoledgements.html" title="Acknoledgements">
 </head>
@@ -28,7 +28,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/html/predef/using_the_predefs.html

@@ -4,8 +4,8 @@
 <title>Using the predefs</title>
 <link rel="stylesheet" href="../boostbook.css" type="text/css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="../index.html" title="Predef 1.2">
+<link rel="home" href="../index.html" title="Predef 1.3">
-<link rel="up" href="../index.html" title="Predef 1.2">
+<link rel="up" href="../index.html" title="Predef 1.3">
 <link rel="prev" href="introduction.html" title="Introduction">
 <link rel="next" href="adding_new_predefs.html" title="Adding new predefs">
 </head>
@@ -211,7 +211,8 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2014 Rene Rivera<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2005, 2008-2015 Rene
+      Rivera<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>

doc/predef.qbk

@@ -1,8 +1,8 @@
 [article Predef
     [quickbook 1.7]
-    [version 1.2]
+    [version 1.3]
     [authors [Rivera, Rene]]
-    [copyright 2005, 2008-2014 Rene Rivera]
+    [copyright 2005, 2008-2015 Rene Rivera]
     [purpose Identification and specification of predefined macros.]
     [license
         Distributed under the Boost Software License, Version 1.0.
@@ -649,6 +649,21 @@ rule require ( expressions + : language ? )
 ``
 [c++]
 
+The expression can also use explicit "and", "or" logical operators
+to for more complex checks:
+
+
+[teletype]
+``
+import path-to-predef-src/check/predef
+    : check require
+    : predef-check predef-require ;
+
+lib my_special_lib : source.cpp
+    : [ predef-require "BOOST_OS_WINDOWS" or "BOOST_OS_VMS"] ;
+``
+[c++]
+
 You can use the [^check] rule for more control and to implement
 something other than control of what gets built. The definition
 for the [^check] rule is:
@@ -673,7 +688,7 @@ import path-to-predef-src/check/predef
 
 exe my_special_exe : source.cpp
     : [ predef-check "BOOST_OS_WINDOWS == 0"
-        : <define>ENABLE_WMF=0
+        : : <define>ENABLE_WMF=0
         : <define>ENABLE_WMF=1 ] ;
 ``
 [c++]

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>
@@ -16,4 +18,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <boost/predef/other.h>
 #include <boost/predef/platform.h>
 
+#include <boost/predef/version.h>
+
 #endif

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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2013
+Copyright Rene Rivera 2008-2015
 Copyright Franz Detro 2014
 Copyright (c) Microsoft Corporation 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2013
+Copyright Rene Rivera 2013-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2011-2013
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2011-2013
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,16 +1,16 @@
 /*
-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)
 */
 
-#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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -29,7 +29,7 @@ Version number available as major, minor, and patch.
  */
 
 #if defined(__COMO__)
-#   if !defined(BOOST_COMP_COMO_DETECTION) && defined(__CONO_VERSION__)
+#   if !defined(BOOST_COMP_COMO_DETECTION) && defined(__COMO_VERSION__)
 #       define BOOST_COMP_COMO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__COMO_VERSION__)
 #   endif
 #   if !defined(BOOST_COMP_COMO_DETECTION)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -14,7 +14,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 /*`
 [heading `BOOST_COMP_SUNPRO`]
 
-[@http://en.wikipedia.org/wiki/Sun_Studio_%28software%29 Sun Studio] compiler.
+[@http://en.wikipedia.org/wiki/Oracle_Solaris_Studio Oracle Solaris Studio] compiler.
 Version number available as major, minor, and patch.
 
 [table
@@ -25,6 +25,8 @@ Version number available as major, minor, and patch.
 
     [[`__SUNPRO_CC`] [V.R.P]]
     [[`__SUNPRO_C`] [V.R.P]]
+    [[`__SUNPRO_CC`] [VV.RR.P]]
+    [[`__SUNPRO_C`] [VV.RR.P]]
     ]
  */
 
@@ -32,10 +34,18 @@ Version number available as major, minor, and patch.
 
 #if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
 #   if !defined(BOOST_COMP_SUNPRO_DETECTION) && defined(__SUNPRO_CC)
-#       define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC)
+#       if (__SUNPRO_CC < 0x5100)
+#           define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC)
+#       else
+#           define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VVRRP(__SUNPRO_CC)
+#       endif
 #   endif
 #   if !defined(BOOST_COMP_SUNPRO_DETECTION) && defined(__SUNPRO_C)
-#       define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C)
+#       if (__SUNPRO_C < 0x5100)
+#           define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C)
+#       else
+#           define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VVRRP(__SUNPRO_C)
+#       endif
 #   endif
 #   if !defined(BOOST_COMP_SUNPRO_DETECTION)
 #       define BOOST_COMP_SUNPRO_DETECTION BOOST_VERSION_NUMBER_AVAILABLE
@@ -53,7 +63,9 @@ Version number available as major, minor, and patch.
 #   include <boost/predef/detail/comp_detected.h>
 #endif
 
-#define BOOST_COMP_SUNPRO_NAME "Sun Studio"
+#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)
@@ -62,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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2014
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2011-2013
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2011-2013
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2011-2013
+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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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

@@ -1,5 +1,5 @@
 /*
-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)
@@ -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