Skip to content

Commit

Permalink
Adding make_heap from ticket 1914
Browse files Browse the repository at this point in the history
  • Loading branch information
hkaiser committed Sep 18, 2020
1 parent 1f5284d commit 09a995d
Show file tree
Hide file tree
Showing 13 changed files with 1,846 additions and 5 deletions.
1 change: 1 addition & 0 deletions libs/full/include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ set(include_headers
hpx/include/parallel_is_partitioned.hpp
hpx/include/parallel_is_sorted.hpp
hpx/include/parallel_lexicographical_compare.hpp
hpx/include/parallel_make_heap.hpp
hpx/include/parallel_memory.hpp
hpx/include/parallel_merge.hpp
hpx/include/parallel_minmax.hpp
Expand Down
10 changes: 10 additions & 0 deletions libs/full/include/include/hpx/include/parallel_make_heap.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright (c) 2015 Grant Mercer
//
// SPDX-License-Identifier: BSL-1.0
// 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)

#pragma once

#include <hpx/parallel/algorithms/make_heap.hpp>
#include <hpx/parallel/container_algorithms/make_heap.hpp>
2 changes: 2 additions & 0 deletions libs/parallelism/algorithms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ set(algorithms_headers
hpx/parallel/algorithms/is_partitioned.hpp
hpx/parallel/algorithms/is_sorted.hpp
hpx/parallel/algorithms/lexicographical_compare.hpp
hpx/parallel/algorithms/make_heap.hpp
hpx/parallel/algorithms/merge.hpp
hpx/parallel/algorithms/minmax.hpp
hpx/parallel/algorithms/mismatch.hpp
Expand Down Expand Up @@ -90,6 +91,7 @@ set(algorithms_headers
hpx/parallel/container_algorithms/generate.hpp
hpx/parallel/container_algorithms.hpp
hpx/parallel/container_algorithms/is_heap.hpp
hpx/parallel/container_algorithms/make_heap.hpp
hpx/parallel/container_algorithms/merge.hpp
hpx/parallel/container_algorithms/minmax.hpp
hpx/parallel/container_algorithms/mismatch.hpp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2016 Hartmut Kaiser
// Copyright (c) 2007-2020 Hartmut Kaiser
// Copyright (c) 2014 Grant Mercer
// Copyright (c) 2017 Taeguk Kwon
//
Expand Down Expand Up @@ -28,6 +28,7 @@
#include <hpx/parallel/algorithms/is_partitioned.hpp>
#include <hpx/parallel/algorithms/is_sorted.hpp>
#include <hpx/parallel/algorithms/lexicographical_compare.hpp>
#include <hpx/parallel/algorithms/make_heap.hpp>
#include <hpx/parallel/algorithms/merge.hpp>
#include <hpx/parallel/algorithms/minmax.hpp>
#include <hpx/parallel/algorithms/mismatch.hpp>
Expand Down
Loading

0 comments on commit 09a995d

Please sign in to comment.