From 4599ae0bfde05e1961d039cd9d414356b295cbcd Mon Sep 17 00:00:00 2001 From: Gennaro Prota Date: Thu, 20 Jul 2006 23:23:09 +0000 Subject: [PATCH] merge from head [removed unnamed namespace (see http://lists.boost.org/Archives/boost/2006/07/107873.php); usual copyright/license/url fixes] [SVN r34647] --- include/boost/none.hpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/include/boost/none.hpp b/include/boost/none.hpp index 693dbdf..b0e94a2 100644 --- a/include/boost/none.hpp +++ b/include/boost/none.hpp @@ -1,10 +1,10 @@ // Copyright (C) 2003, Fernando Luis Cacciola Carballal. // -// Use, modification, and distribution is subject to the Boost Software -// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at +// 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/lib/optional for documentation. +// See http://www.boost.org/lib/optional/ for documentation. // // You are welcome to contact the author at: // fernando_cacciola@hotmail.com @@ -16,15 +16,12 @@ // NOTE: Borland users have to include this header outside any precompiled headers // (bcc<=5.64 cannot include instance data in a precompiled header) +// -- * To be verified, now that there's no unnamed namespace namespace boost { -namespace { - none_t const none = ((none_t)0) ; -} - } // namespace boost #endif