diff --git a/Jamroot b/Jamroot index ea60541da1..1336df5795 100644 --- a/Jamroot +++ b/Jamroot @@ -144,7 +144,7 @@ import option ; import tools/boost\_install/boost-install ; path-constant BOOST_ROOT : . ; -constant BOOST_VERSION : 1.72.0 ; +constant BOOST_VERSION : 1.73.0 ; constant BOOST_JAMROOT_MODULE : $(__name__) ; boostcpp.set-version $(BOOST_VERSION) ; diff --git a/more/getting_started/detail/release-variables.rst b/more/getting_started/detail/release-variables.rst index 6eabf3c45d..cc574645b5 100644 --- a/more/getting_started/detail/release-variables.rst +++ b/more/getting_started/detail/release-variables.rst @@ -5,8 +5,8 @@ .. This file contains all the definitions that need to be updated .. for each new release of Boost. -.. |boost-version-number| replace:: 72 -.. |boost_ver| replace:: ``boost_1_72_0`` -.. |boost_ver-bold| replace:: **boost_1_72_0** +.. |boost-version-number| replace:: 73 +.. |boost_ver| replace:: ``boost_1_73_0`` +.. |boost_ver-bold| replace:: **boost_1_73_0** -.. _sf-download: http://www.boost.org/users/history/version_1_72_0.html +.. _sf-download: http://www.boost.org/users/history/version_1_73_0.html diff --git a/more/getting_started/index.html b/more/getting_started/index.html index 73a8597470..7f8fd71251 100644 --- a/more/getting_started/index.html +++ b/more/getting_started/index.html @@ -3,7 +3,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> 444d55b49... Bump version to 1.73 Boost Getting Started diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html index 2f6983be85..7272790378 100644 --- a/more/getting_started/unix-variants.html +++ b/more/getting_started/unix-variants.html @@ -3,7 +3,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> 444d55b49... Bump version to 1.73 Boost Getting Started on Unix Variants @@ -61,14 +65,14 @@

1   Get Boost

The most reliable way to get a copy of Boost is to download a -distribution from SourceForge:

+distribution from SourceForge:

    -

  1. Download boost_1_72_0.tar.bz2.

    +

  2. Download boost_1_73_0.tar.bz2.

  3. In the directory where you want to put the Boost installation, execute

    -tar --bzip2 -xf /path/to/boost_1_72_0.tar.bz2
+tar --bzip2 -xf /path/to/boost_1_73_0.tar.bz2
@@ -81,7 +85,7 @@ creators usually choose to break Boost up into several packages, reorganize the directory structure of the Boost distribution, and/or rename the library binaries.1 If you have any trouble, we suggest using an official Boost distribution -from SourceForge.

+from SourceForge.

@@ -91,7 +95,7 @@ from 2   The Boost Distribution

This is a sketch of the resulting directory structure:

-boost_1_72_0/ .................The “boost root directory”
+boost_1_73_0/ .................The “boost root directory”
    index.htm .........A copy of www.boost.org starts here
    boost/ .........................All Boost Header files
     
@@ -136,7 +140,7 @@ anything you can use in these directories.

 
 
It's important to note the following:

 
    
-
  1. The path to the boost root directory (often /usr/local/boost_1_72_0) is
+
  2. The path to the boost root directory (often /usr/local/boost_1_73_0) is
 sometimes referred to as $BOOST_ROOT in documentation and
 mailing lists .
    
 
    3. 
@@ -247,7 +251,7 @@ int main()
 
    Now, in the directory where you saved example.cpp, issue the
 following command:
    
 
    -c++ -I path/to/boost_1_72_0 example.cpp -o example
+c++ -I path/to/boost_1_73_0 example.cpp -o example
 
    
 
    To test the result, type:
    
 
    @@ -278,7 +282,7 @@ you'll need to acquire library binaries.
    
 
    Issue the following commands in the shell (don't type $; that
 represents the shell's prompt):
    
 
    -$ cd path/to/boost_1_72_0
+$ cd path/to/boost_1_73_0
 $ ./bootstrap.sh --help
 
    
 
    Select your configuration options and invoke ./bootstrap.sh again
@@ -427,7 +431,7 @@ b2 --build-dir=b
 please see the Boost.Build documentation.
    
 
    For example, your session might look like this:
    
 
    -$ cd ~/boost_1_72_0
+$ cd ~/boost_1_73_0
 $ b2 --build-dir=/tmp/build-boost toolset=gcc stage
 
    
 
    That will build static and shared non-debug multi-threaded variants of the libraries. To build all variants, pass the additional option, “--build-type=complete”.
    
@@ -543,14 +547,14 @@ project.
 
      
 
    1. You can specify the full path to each library:
      
 
      -$ c++ -I path/to/boost_1_72_0 example.cpp -o example \
+$ c++ -I path/to/boost_1_73_0 example.cpp -o example \
    ~/boost/stage/lib/libboost_regex-gcc34-mt-d-1_36.a
 
      
 
      2. 
 
    2. You can separately specify a directory to search (with -Ldirectory) and a library name to search for (with -llibrary,2 dropping the filename's leading lib and trailing
 suffix (.a in this case):
      
 
      -$ c++ -I path/to/boost_1_72_0 example.cpp -o example \
+$ c++ -I path/to/boost_1_73_0 example.cpp -o example \
    -L~/boost/stage/lib/ -lboost_regex-gcc34-mt-d-1_36
 
      
 
      As you can see, this method is just as terse as method A for one
diff --git a/more/getting_started/windows.html b/more/getting_started/windows.html
index c32f44d46c..0429c61767 100644
--- a/more/getting_started/windows.html
+++ b/more/getting_started/windows.html
@@ -3,7 +3,11 @@
 
 
 
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> 444d55b49... Bump version to 1.73
 Boost Getting Started on Windows
 
 
@@ -61,7 +65,7 @@ not supported—they may or may not work.
      
 
      
 
      1   Get Boost
      
 
      The most reliable way to get a copy of Boost is to
-download boost_1_72_0.7z or boost_1_72_0.zip and unpack it to install a complete Boost
+download boost_1_73_0.7z or boost_1_73_0.zip and unpack it to install a complete Boost
 distribution.1
      
 
 
@@ -71,7 +75,7 @@ distribution.1
 
      2   The Boost Distribution
      
 
      This is a sketch of the resulting directory structure:
      
 
      -boost_1_72_0\ .................The “boost root directory”
+boost_1_73_0\ .................The “boost root directory”
    index.htm .........A copy of www.boost.org starts here
    boost\ .........................All Boost Header files
    lib\ .....................precompiled library binaries
@@ -116,7 +120,7 @@ anything you can use in these directories.
      
 
      
 
      It's important to note the following:
      
 
        
-
      1. The path to the boost root directory (often C:\Program Files\boost\boost_1_72_0) is
+
      2. The path to the boost root directory (often C:\Program Files\boost\boost_1_73_0) is
 sometimes referred to as $BOOST_ROOT in documentation and
 mailing lists .
        
 
        3. 
@@ -257,7 +261,7 @@ cd path\to\some\directory
 
    
 
    followed by Return.  For example,
    
 
    -cd C:\Program Files\boost\boost_1_72_0
+cd C:\Program Files\boost\boost_1_73_0
 
    
 
    Long commands can be continued across several lines by typing a
 caret (^) at the end of all but the last line.  Some examples
@@ -282,7 +286,7 @@ select Properties from the resulting pop-up menu
    
 
  3. In Configuration Properties > C/C++ > General > Additional Include
 Directories, enter the path to the Boost root directory, for example
    
 
    
-
    C:\Program Files\boost\boost_1_72_0
    
+
    C:\Program Files\boost\boost_1_73_0
    
 
    
 
    4. 
 
  4. In Configuration Properties > C/C++ > Precompiled Headers, change
@@ -320,7 +324,7 @@ Visual Studio compiler.  In that window, set the  to a suitable location for creating some temporary
 files and type the following command followed by the Return key:
    
 
    -cl /EHsc /I path\to\boost_1_72_0 path\to\example.cpp
+cl /EHsc /I path\to\boost_1_73_0 path\to\example.cpp
 
    
 
    To test the result, type:
    
 
    @@ -489,8 +493,8 @@ b2 --build-dir=b
 please see the Boost.Build documentation.
    
 
    For example, your session might look like this:3
    
 
    -C:\WINDOWS> cd C:\Program Files\boost\boost_1_72_0
-C:\Program Files\boost\boost_1_72_0> b2 ^
+C:\WINDOWS> cd C:\Program Files\boost\boost_1_73_0
+C:\Program Files\boost\boost_1_73_0> b2 ^
 More? --build-dir="C:\Documents and Settings\dave\build-boost" ^
 More? --build-type=complete msvc stage
 
    
@@ -629,7 +633,7 @@ earlier:
    
 select Properties from the resulting pop-up menu
    5. 
 
  5. In Configuration Properties > Linker > Additional Library
 Directories, enter the path to the Boost binaries,
-e.g. C:\Program Files\boost\boost_1_72_0\lib\.
    6. 
+e.g. C:\Program Files\boost\boost_1_73_0\lib\.
 
  6. From the Build menu, select Build Solution.
    7. 
 

 
skip to the next step

@@ -639,10 +643,10 @@ e.g. C:\Program Files\boos
 
For example, we can compile and link the above program from the
 Visual C++ command-line by simply adding the bold text below to
 the command line we used earlier, assuming your Boost binaries are
-in C:\Program Files\boost\boost_1_72_0\lib:

+in C:\Program Files\boost\boost_1_73_0\lib:

 
-cl /EHsc /I path\to\boost_1_72_0 example.cpp   ^
-     /link /LIBPATH:C:\Program Files\boost\boost_1_72_0\lib
+cl /EHsc /I path\to\boost_1_73_0 example.cpp   ^
+     /link /LIBPATH:C:\Program Files\boost\boost_1_73_0\lib
 

 
 

@@ -868,7 +872,7 @@ mailing list.

 
 
 [1]We recommend
-downloading boost_1_72_0.7z and using 7-Zip to decompress
+downloading boost_1_73_0.7z and using 7-Zip to decompress
 it.  We no longer recommend .zip files for Boost because they are twice
 as large as the equivalent .7z files.  We don't recommend using Windows'
 built-in decompression as it can be painfully slow for large archives.