@@ -411,24 +411,27 @@ void test_cast()
411411 pcvvoid_t pcvvoid = pvoid;
412412 pcvvoid = pvvoid;
413413
414- // Test valid static_cast conversions
415- pint = static_pointer_cast<int >(pvoid);
416- pcint = static_pointer_cast<const int >(pcvoid);
417- pvint = static_pointer_cast<volatile int >(pvoid);
418- pcvint = static_pointer_cast<const volatile int >(pvoid);
414+ // Test valid static_cast conversions required by Allocator::pointer
415+ // requirements (void_pointer -> pointer, const_void_pointer -> const_pointer)
416+ pint = static_cast <pint_t >(pvoid);
417+ pcint = static_cast <pcint_t >(pcvoid);
419418
420419 BOOST_TEST (pint == pvoid);
421420 BOOST_TEST (pcint == pint);
422- BOOST_TEST (pvint == pint);
423- BOOST_TEST (pcvint == pint);
424421
425- // Test valid static_cast conversions
422+ // Test valid static_pointer_cast conversions
426423 {
427424 pint = static_pointer_cast<int >(pvoid);
428425 pcint = static_pointer_cast<const int >(pcvoid);
429426 pvint = static_pointer_cast<volatile int >(pvoid);
430427 pcvint = static_pointer_cast<const volatile int >(pvoid);
431428
429+ BOOST_TEST (pint == pvoid);
430+ BOOST_TEST (pcint == pcvoid);
431+ BOOST_TEST (pcint == pint);
432+ BOOST_TEST (pvint == pint);
433+ BOOST_TEST (pcvint == pint);
434+
432435 Derived d;
433436 offset_ptr<Derived> pd (&d);
434437 offset_ptr<Base> pb;
@@ -450,7 +453,7 @@ void test_cast()
450453 BOOST_TEST (pb3.get () == static_cast <Base3*>(pd3.get ()));
451454 }
452455
453- // Test valid const_cast conversions
456+ // Test valid const_pointer_cast conversions
454457 {
455458 pint = const_pointer_cast<int >(pcint);
456459 pint = const_pointer_cast<int >(pvint);
@@ -462,14 +465,14 @@ void test_cast()
462465 pcint = const_pointer_cast<const int >(pvint);
463466 pcint = const_pointer_cast<const int >(pcvint);
464467
465- // Test valid reinterpret_cast conversions
468+ // Test valid reinterpret_pointer_cast conversions
466469 pint = reinterpret_pointer_cast<int >(pvoid);
467470 pcint = reinterpret_pointer_cast<const int >(pcvoid);
468471 pvint = reinterpret_pointer_cast<volatile int >(pvoid);
469472 pcvint = reinterpret_pointer_cast<const volatile int >(pvoid);
470473 }
471474
472- // Test valid dynamic_cast conversions
475+ // Test valid dynamic_pointer_cast conversions
473476 {
474477 {
475478 Derived3 d3;
0 commit comments