update from boost cvs

[lyx.git] / boost / boost / utility.hpp

diff --git a/boost/boost/utility.hpp b/boost/boost/utility.hpp
index 5942fb902f6de39f373bba9c18e4d3c01fe3ecfc..fa99b9a14818c2da81ec116992415c36d73bf657 100644 (file)
--- a/boost/boost/utility.hpp
+++ b/boost/boost/utility.hpp
@@ -39,24 +39,16 @@ namespace boost
     template< typename T >
     inline void checked_delete(T * x)
     {
-# if !((defined(__BORLANDC__) && __BORLANDC__ <= 0x0551) || (defined(__ICL) && __ICL <= 500))
-        BOOST_STATIC_ASSERT( sizeof(T) ); // assert type complete at point
-                                          // of instantiation
-# else
-        sizeof(T); // force error if type incomplete
-# endif
+        BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point
+                                               // of instantiation
         delete x;
     }
 
     template< typename T >
     inline void checked_array_delete(T  * x)
     {
-# if !((defined(__BORLANDC__) && __BORLANDC__ <= 0x0551) || (defined(__ICL) && __ICL <= 500))
-        BOOST_STATIC_ASSERT( sizeof(T) ); // assert type complete at point
-                                          // of instantiation
-# else
-        sizeof(T); // force error if type incomplete
-# endif
+        BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point
+                                               // of instantiation
         delete [] x;
     }
 
@@ -95,31 +87,6 @@ namespace boost
         const noncopyable& operator=( const noncopyable& );
     }; // noncopyable
 
-//  class tied  -------------------------------------------------------//
-
-    // A helper for conveniently assigning the two values from a pair
-    // into separate variables. The idea for this comes from Jaakko J\84rvi's
-    // Binder/Lambda Library.
-
-    // Constributed by Jeremy Siek
-
-    template <class A, class B>
-    class tied {
-    public:
-      inline tied(A& a, B& b) : _a(a), _b(b) { }
-      template <class U, class V>
-      inline tied& operator=(const std::pair<U,V>& p) {
-        _a = p.first;
-        _b = p.second;
-        return *this;
-      }
-    protected:
-      A& _a;
-      B& _b;
-    };
-
-    template <class A, class B>
-    inline tied<A,B> tie(A& a, B& b) { return tied<A,B>(a, b); }
 
 } // namespace boost