Merging changes from trunk.

[SVN r58421]
This commit is contained in:
Emil Dotchevski
2009-12-16 22:26:57 +00:00
parent 9fab32d84c
commit 72c90873d0
29 changed files with 746 additions and 683 deletions

View File

@ -10,10 +10,6 @@
#include <boost/detail/workaround.hpp>
#include <string>
#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
struct my_tag {};
#endif
typedef boost::error_info<struct my_tag,int> my_info;
template <class T>
@ -556,7 +552,7 @@ main()
}
try
{
throw boost::enable_current_exception(derives_std_boost_exception("what2") << boost::errinfo_nested_exception(p) );
throw boost::enable_current_exception(derives_std_boost_exception("what2") << boost::errinfo_nested_exception(p) );
}
catch(
... )