merge proto from trunk to release branch

[SVN r48800]

.gitmodules

@@ -302,6 +302,10 @@
 	path = libs/pool
 	url = ../pool.git
 	fetchRecurseSubmodules = on-demand
+[submodule "proto"]
+	path = libs/proto
+	url = ../proto.git
+	fetchRecurseSubmodules = on-demand
 [submodule "fusion"]
 	path = libs/fusion
 	url = ../fusion.git

doc/Jamfile.v2

@@ -28,6 +28,8 @@ boostbook doc
     <dependency>../libs/foreach/doc//foreach
     <dependency>../libs/mpi/doc//mpi
     <dependency>../libs/mpi/doc//mpi_autodoc.xml
+    #<dependency>../libs/proto/doc//protodoc.xml 
+    <dependency>../libs/proto/doc//proto
     <dependency>../libs/typeof/doc//typeof
     <dependency>../libs/xpressive/doc//autodoc.xml
     <dependency>../libs/xpressive/doc//xpressive
@@ -52,6 +54,7 @@ boostbook doc
     <implicit-dependency>../libs/static_assert/doc//static_assert
     <implicit-dependency>../libs/tr1/doc//tr1
     <implicit-dependency>../libs/foreach/doc//foreach
+    <implicit-dependency>../libs/proto/doc//proto
     <implicit-dependency>../libs/typeof/doc//typeof
     <implicit-dependency>../libs/xpressive/doc//xpressive
     <implicit-dependency>../tools/jam/doc//bjam

doc/src/boost.xml

@@ -536,6 +536,8 @@
      </libraryinfo>
    </library>
    
+   <xi:include href="proto.xml"/>
+
    <library name="Python" dirname="python" html-only="1">
      <libraryinfo>
        <author>

libs/libraries.htm

@@ -49,7 +49,7 @@ content="text/html; charset=iso-8859-1">
       <dt><a href="#Generic">Generic Programming</a></dt>
       <dt><a href="#Metaprogramming">Template Metaprogramming</a></dt>
       <dt><a href="#Preprocessor">Preprocessor Metaprogramming</a></dt>
-      <dt><a href="#Concurrent">Concurrent Programming</a>
+      <dt><a href="#Concurrent">Concurrent Programming</a></dt>
       <dt><a href="#Math">Math and numerics</a></dt>
       <dt><a href="#Correctness">Correctness and testing</a></dt>
       <dt><a href="#Data">Data structures</a></dt>
@@ -215,6 +215,8 @@ how to download, build, and install the libraries.</p>
     <li><a href="property_map/property_map.html">property map</a>
         - Concepts defining interfaces which map key objects to
         value objects, from Jeremy Siek.</li>
+    <li><a href="proto/index.html">proto</a> - Expression template library and compiler 
+        construction toolkit for domain-specific embedded languages, from Eric Niebler.</li>
     <li><a href="python/doc/index.html">python</a> - Reflects C++
         classes and functions into <a
         href="http://www.python.org">Python</a>, from Dave
@@ -442,6 +444,8 @@ how to download, build, and install the libraries.</p>
     <li><a href="property_map/property_map.html">property map</a>
         - Concepts defining interfaces which map key objects to
         value objects, from Jeremy Siek.</li>
+    <li><a href="proto/index.html">proto</a> - Expression template library and compiler 
+        construction toolkit for domain-specific embedded languages, from Eric Niebler.</li>
     <li><a href="static_assert/static_assert.htm">static_assert</a>
         - Static assertions (compile time assertions), from John
         Maddock.</li>

libs/maintainers.txt

@@ -8,7 +8,7 @@
 # maintainers. When making changes to this file, please be careful
 # to closely follow the format of the library.
 
-accumulators          Eric Niebler <eric -at- boost-consulting.com>
+accumulators          Eric Niebler <eric -at- boostpro.com>
 algorithm/minmax      Herve Bronnimann <hbr -at- poly.edu>
 algorithm/string      Pavol Droba <droba -at- topmail.sk>
 any                   Alexander Nasonov <alexander.nasonov -at- gmail.com>
@@ -27,7 +27,7 @@ disjoint_sets         Jeremy Siek <jeremy.siek -at- gmail.com>
 dynamic_bitset        Jeremy Siek <jeremy.siek -at- gmail.com>, Gennaro Prota <gennaro.prota -at- yahoo.com>
 exception             Emil Dotchevski <emil -at- revergestudios.com>
 filesystem            Beman Dawes <bdawes -at- acm.org>
-foreach               Eric Niebler <eric -at- boost-consulting.com>
+foreach               Eric Niebler <eric -at- boostpro.com>
 format                Samuel Krempp <krempp -at- crans.ens-cachan.fr>
 function              Douglas Gregor <dgregor -at- cs.indiana.edu>
 function_types        Tobias Schwinger <tschwinger -at- isonews2.com>
@@ -58,6 +58,7 @@ pool                  Stephen Cleary <scleary -at- jerviswebb.com>
 preprocessor          Paul Mensonides <pmenso57 -at- comcast.net>
 program_options       Vladimir Prus <ghost -at- cs.msu.su>
 property_map          Douglas Gregor <dgregor -at- cs.indiana.edu>
+proto                 Eric Niebler <eric -at- boostpro.com>
 ptr_container         Thorsten Ottosen <nesotto -at- cs.auc.dk>
 python                David Abrahams <dave -at- boost-consulting.com>
 random                Jens Maurer <Jens.Maurer -at- gmx.net>
@@ -85,6 +86,6 @@ utility/enable_if     Jaakko Jarvi <jarvi -at- cs.tamu.edu>, Jeremiah Willcock <
 utility/swap          Joseph Gauterin <joseph.gauterin -at- googlemail.com>
 variant               Eric Friedman <ericbrandon -at- gmail.com>
 wave                  Hartmut Kaiser <hartmut.kaiser -at- gmail.com>
-xpressive             Eric Niebler <eric -at- boost-consulting.com>
+xpressive             Eric Niebler <eric -at- boostpro.com>
 
 

libs/proto

@@ -0,0 +1 @@
+Subproject commit 6072f42d7f9d7452146c0f858ca24716db181b35

status/Jamfile.v2

@@ -69,6 +69,7 @@ build-project ../libs/optional/test ;          # test-suite optional
 build-project ../libs/parameter/test ;         # test-suite parameter
 build-project ../libs/program_options/test ;   # test-suite program_options
 build-project ../libs/property_map/test ;      # test-suite property_map
+build-project ../libs/proto/test ;             # test-suite proto
 build-project ../libs/ptr_container/test ;     # test-suite ptr_container
 build-project ../libs/python/test ;            # test-suite python
 build-project ../libs/random/test ;            # test-suite random

status/explicit-failures-markup.xml

@@ -2465,6 +2465,16 @@ for more information.
         </mark-expected-failures>
     </library>
 
+    <!-- proto -->
+    <library name="proto">
+      <mark-unusable>
+        <toolset name="sun-5.7"/>
+        <toolset name="sun-5.8"/>
+        <toolset name="sun-5.9"/>
+        <toolset name="borland-*"/>
+      </mark-unusable>
+    </library>
+
     <!-- rational -->
     <library name="rational">
         <mark-expected-failures>