Fixes for VC2005 and replaced some remaining placement news/destroys with allocator traits

[SVN r76262]
2012-01-01 18:48:00 +00:00
parent 3f3a63d92a
commit ccff43c8fb
5 changed files with 67 additions and 145 deletions
@@ -50,130 +50,7 @@ inline void construct_in_place(A &a, T *dest, emplace_iterator<U, EF, D> ei)
 {
   ei.construct_in_place(a, dest);
 }
-/*
-template<class InIt, class OutIt>
-struct optimize_assign
-{
-   static const bool value = false;
-};

-template<class T>
-struct optimize_assign<const T*, T*>
-{
-   static const bool value = boost::has_trivial_assign<T>::value;
-};
-
-template<class T>
-struct optimize_assign<T*, T*>
-   :  public optimize_assign<const T*, T*>
-{};
-
-template<class InIt, class OutIt>
-struct optimize_copy
-{
-   static const bool value = false;
-};
-
-template<class T>
-struct optimize_copy<const T*, T*>
-{
-   static const bool value = boost::has_trivial_copy<T>::value;
-};
-
-template<class T>
-struct optimize_copy<T*, T*>
-   :  public optimize_copy<const T*, T*>
-{};
-
-template<class InIt, class OutIt> inline
-OutIt copy_n_dispatch(InIt first, typename std::iterator_traits<InIt>::difference_type length, OutIt dest, container_detail::bool_<false>)
-{
-   for (; length--; ++dest, ++first)
-      *dest = *first;
-   return dest;
-}
-
-template<class T> inline
-T *copy_n_dispatch(const T *first, typename std::iterator_traits<const T*>::difference_type length, T *dest, container_detail::bool_<true>)
-{
-   std::size_t size = length*sizeof(T);
-   return (static_cast<T*>(std::memmove(dest, first, size))) + size;
-}
-
-template<class InIt, class OutIt> inline
-OutIt copy_n(InIt first, typename std::iterator_traits<InIt>::difference_type length, OutIt dest)
-{
-   const bool do_optimized_assign = optimize_assign<InIt, OutIt>::value;
-   return copy_n_dispatch(first, length, dest, container_detail::bool_<do_optimized_assign>());
-}
-
-template<class InIt, class FwdIt> inline
-FwdIt uninitialized_copy_n_dispatch
-   (InIt first, 
-    typename std::iterator_traits<InIt>::difference_type count,
-    FwdIt dest, container_detail::bool_<false>)
-{
-   typedef typename std::iterator_traits<FwdIt>::value_type value_type;
-   //Save initial destination position
-   FwdIt dest_init = dest;
-   typename std::iterator_traits<InIt>::difference_type new_count = count+1;
-
-   BOOST_TRY{
-      //Try to build objects
-      for (; --new_count; ++dest, ++first){
-         construct_in_place(container_detail::to_raw_pointer(&*dest), first);
-      }
-   }
-   BOOST_CATCH(...){
-      //Call destructors
-      new_count = count - new_count;
-      for (; new_count--; ++dest_init){
-         container_detail::to_raw_pointer(&*dest_init)->~value_type();
-      }
-      BOOST_RETHROW
-   }
-   BOOST_CATCH_END
-   return dest;
-}
-template<class T> inline
-T *uninitialized_copy_n_dispatch(const T *first, typename std::iterator_traits<const T*>::difference_type length, T *dest, container_detail::bool_<true>)
-{
-   std::size_t size = length*sizeof(T);
-   return (static_cast<T*>(std::memmove(dest, first, size))) + size;
-}
-
-template<class InIt, class FwdIt> inline
-FwdIt uninitialized_copy_n
-   (InIt first, 
-    typename std::iterator_traits<InIt>::difference_type count,
-    FwdIt dest)
-{
-   const bool do_optimized_copy = optimize_copy<InIt, FwdIt>::value;
-   return uninitialized_copy_n_dispatch(first, count, dest, container_detail::bool_<do_optimized_copy>());
-}
-
-// uninitialized_copy_copy
-// Copies [first1, last1) into [result, result + (last1 - first1)), and
-// copies [first2, last2) into
-// [result + (last1 - first1), result + (last1 - first1) + (last2 - first2)).
-template <class InpIt1, class InpIt2, class FwdIt>
-FwdIt uninitialized_copy_copy
-   (InpIt1 first1, InpIt1 last1, InpIt2 first2, InpIt2 last2, FwdIt result)
-{
-   typedef typename std::iterator_traits<FwdIt>::value_type value_type;
-   FwdIt mid = std::uninitialized_copy(first1, last1, result);
-   BOOST_TRY {
-      return std::uninitialized_copy(first2, last2, mid);
-   }
-   BOOST_CATCH(...){
-      for(;result != mid; ++result){
-         container_detail::to_raw_pointer(&*result)->~value_type();
-      }
-      BOOST_RETHROW
-   }
-   BOOST_CATCH_END
-}
-*/
 }  //namespace container { 
 }  //namespace boost {