merge trunk to release

[SVN r86727]
This commit is contained in:
Robert Ramey
2013-11-16 20:13:39 +00:00
parent bda94d16d1
commit b454953f27
148 changed files with 183 additions and 28350 deletions

View File

@@ -8,7 +8,7 @@
// should pass compilation and execution
#include <algorithm>
#include <algorithm> // std::copy
#include <vector>
#include <fstream>
#include <cstddef> // size_t, NULL
@@ -57,8 +57,6 @@ struct random_key {
}
};
BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(random_key)
void
test_map(){
const char * testfile = boost::archive::tmpnam(NULL);