forked from boostorg/unordered
Add the new allocator constructors, use composition instead of inheritance for the implementation and some small fixes.
Merged revisions 43922,43962,43966,43971,43981,43995-43996,44042,44046-44048,44057 via svnmerge from https://svn.boost.org/svn/boost/branches/unordered/trunk ........ r43922 | danieljames | 2008-03-29 14:55:59 +0000 (Sat, 29 Mar 2008) | 1 line Fix some typos in the reference documentation. ........ r43962 | danieljames | 2008-03-31 18:29:59 +0100 (Mon, 31 Mar 2008) | 1 line Add a name variable to the release script, so that I can have different release names in different branches. ........ r43966 | danieljames | 2008-03-31 18:43:16 +0100 (Mon, 31 Mar 2008) | 1 line Fix the image directory for standalone docs. ........ r43971 | danieljames | 2008-03-31 19:17:25 +0100 (Mon, 31 Mar 2008) | 1 line Fix the unordered stylesheet. ........ r43981 | danieljames | 2008-04-01 13:31:26 +0100 (Tue, 01 Apr 2008) | 2 lines Cast the pointer in the Visual C++ 6.5 _Charalloc method. ........ r43995 | danieljames | 2008-04-02 12:50:27 +0100 (Wed, 02 Apr 2008) | 1 line Try using the interprocess containers for testing. Compilation is a bit slower but hopefully I'll run into less cross-platform problems. ........ r43996 | danieljames | 2008-04-02 13:25:49 +0100 (Wed, 02 Apr 2008) | 1 line Revert my experiment with the interprocess containers. It didn't work out. ........ r44042 | danieljames | 2008-04-04 20:38:09 +0100 (Fri, 04 Apr 2008) | 1 line Make hash table data a member of hash table, instead of a base. ........ r44046 | danieljames | 2008-04-05 12:38:05 +0100 (Sat, 05 Apr 2008) | 1 line Remove rvalue_ref from Jamfile.v2 - I didn't mean to check it in. ........ r44047 | danieljames | 2008-04-05 12:39:38 +0100 (Sat, 05 Apr 2008) | 1 line New constructors with allocators. ........ r44048 | danieljames | 2008-04-05 12:58:11 +0100 (Sat, 05 Apr 2008) | 1 line Document the new constructors. ........ r44057 | danieljames | 2008-04-05 17:08:23 +0100 (Sat, 05 Apr 2008) | 1 line Fix some bugs in the exception testing code. ........ [SVN r44417]
This commit is contained in:
@@ -70,7 +70,7 @@ namespace test
|
||||
using namespace std;
|
||||
T* ptr = static_cast<T*>(malloc(n * sizeof(char)));
|
||||
if(!ptr) throw std::bad_alloc();
|
||||
return ptr;
|
||||
return (char*) ptr;
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -163,6 +163,7 @@ namespace test {
|
||||
test_runner(Test const& t) : test_(t) {}
|
||||
void operator()() const {
|
||||
DISABLE_EXCEPTIONS;
|
||||
test::scope = "";
|
||||
BOOST_DEDUCED_TYPENAME Test::data_type x(test_.init());
|
||||
BOOST_DEDUCED_TYPENAME Test::strong_type strong;
|
||||
strong.store(x);
|
||||
@@ -223,9 +224,15 @@ namespace test {
|
||||
success = true;
|
||||
}
|
||||
catch(test_failure) {
|
||||
BOOST_ERROR("test_failure caught.");
|
||||
break;
|
||||
}
|
||||
catch(test_exception) {
|
||||
continue;
|
||||
}
|
||||
catch(...) {
|
||||
BOOST_ERROR("Unexpected exception.");
|
||||
break;
|
||||
}
|
||||
} while(!success);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user