Merge changes from trunk root + boost/version.hpp

[SVN r46719]
This commit is contained in:
Beman Dawes
2008-06-26 15:57:12 +00:00
parent 365c54860b
commit 7264ef8ac1

View File

@@ -15,19 +15,19 @@
// will cause a recompile every time a new boost version is // will cause a recompile every time a new boost version is
// released. // released.
// //
// BOOST_VERSION % 100 is the sub-minor version // BOOST_VERSION % 100 is the patch level
// BOOST_VERSION / 100 % 1000 is the minor version // BOOST_VERSION / 100 % 1000 is the minor version
// BOOST_VERSION / 100000 is the major version // BOOST_VERSION / 100000 is the major version
#define BOOST_VERSION 103501 #define BOOST_VERSION 103600
// //
// BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION // BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
// but as a *string* in the form "x_y" where x is the major version // but as a *string* in the form "x_y[_z]" where x is the major version
// number and y is the minor version number. This is used by // number, y is the minor version number, and z is the patch level if not 0.
// <config/auto_link.hpp> to select which library version to link to. // This is used by <config/auto_link.hpp> to select which library version to link to.
#define BOOST_LIB_VERSION "1_35_1" #define BOOST_LIB_VERSION "1_36"
#endif #endif