From 91425e85c4d5a8e2515ded9f12753a7210d24086 Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glenfe@live.com>
Date: Mon, 2 Jun 2014 19:55:59 -0700
Subject: [PATCH] Remove empty_deleter from core

---
 include/boost/core/empty_deleter.hpp    | 42 -------------------------
 include/boost/utility/empty_deleter.hpp | 42 ++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 46 deletions(-)
 delete mode 100644 include/boost/core/empty_deleter.hpp

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 <tt>shared_ptr</tt>s that point to some object that should not be
- * deleted (i.e. a variable on the stack or some global singleton, like <tt>std::cout</tt>).
- */
-
-#ifndef BOOST_CORE_EMPTY_DELETER_HPP
-#define BOOST_CORE_EMPTY_DELETER_HPP
-
-#include <boost/config.hpp>
-#include <boost/core/null_deleter.hpp>
-
-#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 <tt>shared_ptr</tt>s that point to some object that should not be
+ * deleted (i.e. a variable on the stack or some global singleton, like <tt>std::cout</tt>).
+ */
+
 #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 <boost/core/empty_deleter.hpp>
+#include <boost/config.hpp>
+#include <boost/core/null_deleter.hpp>
 
+#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