Browse Source

Merge pull request #2977 from lioncash/algorithm

common: Rename binary_find.h to algorithm.h
nce_cpp
bunnei 6 years ago
committed by GitHub
parent
commit
32588f88da
  1. 2
      src/common/CMakeLists.txt
  2. 6
      src/common/algorithm.h
  3. 1
      src/video_core/texture_cache/surface_base.cpp
  4. 5
      src/video_core/texture_cache/surface_base.h

2
src/common/CMakeLists.txt

@ -95,11 +95,11 @@ add_custom_command(OUTPUT scm_rev.cpp
)
add_library(common STATIC
algorithm.h
alignment.h
assert.h
detached_tasks.cpp
detached_tasks.h
binary_find.h
bit_field.h
bit_util.h
cityhash.cpp

6
src/common/binary_find.h → src/common/algorithm.h

@ -5,6 +5,12 @@
#pragma once
#include <algorithm>
#include <functional>
// Algorithms that operate on iterators, much like the <algorithm> header.
//
// Note: If the algorithm is not general-purpose and/or doesn't operate on iterators,
// it should probably not be placed within this header.
namespace Common {

1
src/video_core/texture_cache/surface_base.cpp

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/algorithm.h"
#include "common/assert.h"
#include "common/common_types.h"
#include "common/microprofile.h"

5
src/video_core/texture_cache/surface_base.h

@ -4,12 +4,11 @@
#pragma once
#include <algorithm>
#include <optional>
#include <tuple>
#include <unordered_map>
#include <vector>
#include "common/assert.h"
#include "common/binary_find.h"
#include "common/common_types.h"
#include "video_core/gpu.h"
#include "video_core/morton.h"

Loading…
Cancel
Save