From b5b496195157cfd6e8f7787330306337371ca497 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Fri, 12 Oct 2018 08:13:35 -0700
Subject: [PATCH] Remove deprecated local dataflow compatibility

---
 CMakeLists.txt              |  8 --------
 hpx/dataflow.hpp            |  1 -
 hpx/lcos/local/dataflow.hpp | 31 -------------------------------
 3 files changed, 40 deletions(-)
 delete mode 100644 hpx/lcos/local/dataflow.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb6b8e121d26..0fa2ccc215ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -925,14 +925,6 @@ hpx_option(HPX_WITH_VIM_YCM BOOL
 ################################################################################
 # Backwards compatibility options (edit for each release)
 
-# HPX_WITH_LOCAL_DATAFLOW_COMPATIBILITY: introduced in V0.9.99
-hpx_option(HPX_WITH_LOCAL_DATAFLOW_COMPATIBILITY BOOL
-    "Enable backwards compatibility for hpx::lcos::local::dataflow() functions"
-    OFF ADVANCED)
-if(HPX_WITH_LOCAL_DATAFLOW_COMPATIBILITY)
-  hpx_add_config_define(HPX_HAVE_LOCAL_DATAFLOW_COMPATIBILITY)
-endif()
-
 # HPX_WITH_GENERIC_EXECUTION_POLICY: introduced in V0.9.99
 hpx_option(HPX_WITH_GENERIC_EXECUTION_POLICY BOOL
     "Enable the generic execution policy (default: OFF)"
diff --git a/hpx/dataflow.hpp b/hpx/dataflow.hpp
index c5fd01866806..f02a95cdc38b 100644
--- a/hpx/dataflow.hpp
+++ b/hpx/dataflow.hpp
@@ -8,6 +8,5 @@
 
 #include <hpx/lcos/future.hpp>
 #include <hpx/lcos/dataflow.hpp>
-#include <hpx/lcos/local/dataflow.hpp>
 
 #endif /*HPX_DATAFLOW_HPP*/
diff --git a/hpx/lcos/local/dataflow.hpp b/hpx/lcos/local/dataflow.hpp
deleted file mode 100644
index 7ec2244f5b65..000000000000
--- a/hpx/lcos/local/dataflow.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-//  Copyright (c)      2013 Thomas Heller
-//  Copyright (c) 2007-2015 Hartmut Kaiser
-//
-//  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)
-
-#ifndef HPX_LCOS_LOCAL_DATAFLOW_HPP
-#define HPX_LCOS_LOCAL_DATAFLOW_HPP
-
-#include <hpx/config.hpp>
-
-#if defined(HPX_HAVE_LOCAL_DATAFLOW_COMPATIBILITY)
-#include <hpx/lcos/dataflow.hpp>
-
-#include <utility>
-
-namespace hpx { namespace lcos { namespace local
-{
-    template <typename F, typename ...Ts>
-    HPX_DEPRECATED(HPX_DEPRECATED_MSG) HPX_FORCEINLINE
-    auto dataflow(F && f, Ts &&... ts)
-    ->  decltype(lcos::detail::dataflow_dispatch<F>::call(
-            std::forward<F>(f), std::forward<Ts>(ts)...))
-    {
-        return lcos::detail::dataflow_dispatch<F>::call(
-            std::forward<F>(f), std::forward<Ts>(ts)...);
-    }
-}}}
-#endif
-
-#endif /*HPX_LCOS_LOCAL_DATAFLOW_HPP*/