diff --git a/README.md b/README.md index 9cf526c..68fc32e 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ The criteria for inclusion is that the utility component be: ### More information -* [Documentation](http://boost.org/libs/core) +* [Documentation](http://boostorg.github.io/core) ### License -Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). +Distributed under the [Boost Software License, Version 1.0](http://boost.org/LICENSE_1_0.txt). diff --git a/include/boost/core/empty_deleter.hpp b/include/boost/core/empty_deleter.hpp deleted file mode 100644 index 441af0b..0000000 --- a/include/boost/core/empty_deleter.hpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright Andrey Semashev 2007 - 2013. - * 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) - */ -/*! - * \file empty_deleter.hpp - * \author Andrey Semashev - * \date 22.04.2007 - * - * This header contains an \c empty_deleter implementation. This is an empty - * function object that receives a pointer and does nothing with it. - * Such empty deletion strategy may be convenient, for example, when - * constructing shared_ptrs that point to some object that should not be - * deleted (i.e. a variable on the stack or some global singleton, like std::cout). - */ - -#ifndef BOOST_CORE_EMPTY_DELETER_HPP -#define BOOST_CORE_EMPTY_DELETER_HPP - -#include -#include - -#ifdef BOOST_HAS_PRAGMA_ONCE -#pragma once -#endif - -#if defined(__GNUC__) -#pragma message "This header is deprecated, use boost/core/null_deleter.hpp instead." -#elif defined(_MSC_VER) -#pragma message("This header is deprecated, use boost/core/null_deleter.hpp instead.") -#endif - -namespace boost { - -//! A deprecated name for \c null_deleter -typedef null_deleter empty_deleter; - -} // namespace boost - -#endif // BOOST_CORE_EMPTY_DELETER_HPP diff --git a/include/boost/utility/empty_deleter.hpp b/include/boost/utility/empty_deleter.hpp index 279a63c..91bc47b 100644 --- a/include/boost/utility/empty_deleter.hpp +++ b/include/boost/utility/empty_deleter.hpp @@ -1,9 +1,43 @@ +/* + * Copyright Andrey Semashev 2007 - 2013. + * 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) + */ + +/*! + * \file empty_deleter.hpp + * \author Andrey Semashev + * \date 22.04.2007 + * + * This header contains an \c empty_deleter implementation. This is an empty + * function object that receives a pointer and does nothing with it. + * Such empty deletion strategy may be convenient, for example, when + * constructing shared_ptrs that point to some object that should not be + * deleted (i.e. a variable on the stack or some global singleton, like std::cout). + */ + #ifndef BOOST_UTILITY_EMPTY_DELETER_HPP #define BOOST_UTILITY_EMPTY_DELETER_HPP -// The header file at this path is deprecated; -// use boost/core/empty_deleter.hpp instead. - -#include +#include +#include +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once #endif + +#if defined(__GNUC__) +#pragma message "This header is deprecated, use boost/core/null_deleter.hpp instead." +#elif defined(_MSC_VER) +#pragma message("This header is deprecated, use boost/core/null_deleter.hpp instead.") +#endif + +namespace boost { + +//! A deprecated name for \c null_deleter +typedef null_deleter empty_deleter; + +} // namespace boost + +#endif // BOOST_UTILITY_EMPTY_DELETER_HPP