Merge [69242] to release. Fixes #4288. Fixes #5189.

[SVN r70432]
2011-03-22 23:05:48 +00:00
parent d71cc6ab08
commit 545745d649
2 changed files with 7 additions and 4 deletions
@@ -33,10 +33,7 @@
 # pragma warn -8092 // template argument passed to 'find' is not an iterator
 #endif

-#include <boost/scoped_ptr.hpp>
-#include <boost/scoped_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
+#include <boost/smart_ptr.hpp>

 #include <boost/detail/lightweight_test.hpp>