[ox/std] Rename bitops.hpp to bit.hpp to mirror the new bit in C++20
This commit is contained in:
parent
c9f91c16c2
commit
d9b363330b
2
deps/ox/src/ox/mc/write.hpp
vendored
2
deps/ox/src/ox/mc/write.hpp
vendored
@ -10,7 +10,7 @@
|
||||
|
||||
#include <ox/model/optype.hpp>
|
||||
#include <ox/model/types.hpp>
|
||||
#include <ox/std/bitops.hpp>
|
||||
#include <ox/std/bit.hpp>
|
||||
#include <ox/std/byteswap.hpp>
|
||||
#include <ox/std/string.hpp>
|
||||
#include <ox/std/types.hpp>
|
||||
|
2
deps/ox/src/ox/std/CMakeLists.txt
vendored
2
deps/ox/src/ox/std/CMakeLists.txt
vendored
@ -36,7 +36,7 @@ target_link_libraries(
|
||||
install(
|
||||
FILES
|
||||
assert.hpp
|
||||
bitops.hpp
|
||||
bit.hpp
|
||||
buildinfo.hpp
|
||||
byteswap.hpp
|
||||
defines.hpp
|
||||
|
@ -13,7 +13,7 @@
|
||||
namespace ox {
|
||||
|
||||
template<typename T>
|
||||
[[nodiscard]] inline constexpr T rotateLeft(T i, std::size_t shift) noexcept {
|
||||
[[nodiscard]] constexpr T rotl(T i, int shift) noexcept {
|
||||
constexpr auto bits = sizeof(i) * 8;
|
||||
return (i << shift) | (i >> (bits - shift));
|
||||
}
|
6
deps/ox/src/ox/std/random.cpp
vendored
6
deps/ox/src/ox/std/random.cpp
vendored
@ -6,7 +6,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "bitops.hpp"
|
||||
#include "bit.hpp"
|
||||
#include "random.hpp"
|
||||
|
||||
namespace ox {
|
||||
@ -28,8 +28,8 @@ uint64_t Random::gen() {
|
||||
auto retval = s0 + s1;
|
||||
|
||||
s1 ^= s0;
|
||||
m_seed[0] = ox::rotateLeft(s0, 55) ^ s1 ^ (s1 << 14);
|
||||
m_seed[1] = ox::rotateLeft(s1, 36);
|
||||
m_seed[0] = ox::rotl(s0, 55) ^ s1 ^ (s1 << 14);
|
||||
m_seed[1] = ox::rotl(s1, 36);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
2
deps/ox/src/ox/std/std.hpp
vendored
2
deps/ox/src/ox/std/std.hpp
vendored
@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "assert.hpp"
|
||||
#include "bitops.hpp"
|
||||
#include "bit.hpp"
|
||||
#include "byteswap.hpp"
|
||||
#include "error.hpp"
|
||||
#include "hardware.hpp"
|
||||
|
2
deps/ox/src/ox/std/typetraits.hpp
vendored
2
deps/ox/src/ox/std/typetraits.hpp
vendored
@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "bitops.hpp"
|
||||
#include "bit.hpp"
|
||||
|
||||
#if __has_include(<type_traits>)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user