X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Fchecked_delete.hpp;h=9bb84e8e1ba9f1aa8c349a34618877c7c2e3ccdf;hb=43c09d723435a5b203f2ac0c39e2086de836b386;hp=3f7ca47c27758b1053fcdee69c7fa60d2310e60f;hpb=0c863a4ec15e40f29ec35b398ac0bd066b433c69;p=lyx.git

diff --git a/boost/boost/checked_delete.hpp b/boost/boost/checked_delete.hpp
index 3f7ca47c27..9bb84e8e1b 100644
--- a/boost/boost/checked_delete.hpp
+++ b/boost/boost/checked_delete.hpp
@@ -1,6 +1,8 @@
 #ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
 #define BOOST_CHECKED_DELETE_HPP_INCLUDED
 
+// MS compatible compilers support #pragma once
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif
@@ -8,13 +10,13 @@
 //
 //  boost/checked_delete.hpp
 //
-//  Copyright (c) 1999, 2000, 2001, 2002 boost.org
 //  Copyright (c) 2002, 2003 Peter Dimov
+//  Copyright (c) 2003 Daniel Frey
+//  Copyright (c) 2003 Howard Hinnant
 //
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 //
 //  See http://www.boost.org/libs/utility/checked_delete.html for documentation.
 //
@@ -26,14 +28,16 @@ namespace boost
 
 template<class T> inline void checked_delete(T * x)
 {
-    // Intel 7 accepts sizeof(incomplete) as 0 in system headers
+    // intentionally complex - simplification causes regressions
     typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
+    (void) sizeof(type_must_be_complete);
     delete x;
 }
 
 template<class T> inline void checked_array_delete(T * x)
 {
     typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
+    (void) sizeof(type_must_be_complete);
     delete [] x;
 }