Browse Source

Some Visual Studio compilation fixes

wip/image-kernel
Sam Hocevar 2 years ago
parent
commit
d06b110883
2 changed files with 5 additions and 4 deletions
  1. +3
    -2
      include/lol/private/base/string.h
  2. +2
    -2
      include/lol/private/math/functions.h

+ 3
- 2
include/lol/private/base/string.h View File

@@ -1,8 +1,8 @@
// //
// Lol Engine // Lol Engine
// //
// Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
// © 20132015 Benjamin “Touky” Huet <huet.benjamin@gmail.com>
// Copyright © 2010–2023 Sam Hocevar <sam@hocevar.net>
// © 20132015 Benjamin “Touky” Huet <huet.benjamin@gmail.com>
// //
// Lol Engine is free software. It comes without any warranty, to // Lol Engine is free software. It comes without any warranty, to
// the extent permitted by applicable law. You can redistribute it // the extent permitted by applicable law. You can redistribute it
@@ -24,6 +24,7 @@
#include <vector> // std::vector #include <vector> // std::vector
#include <string> // std::basic_string #include <string> // std::basic_string
#include <algorithm> // std::transform #include <algorithm> // std::transform
#include <iterator> // std::back_inserter
#include <cstdarg> // va_list #include <cstdarg> // va_list
#include <cctype> // size_t #include <cctype> // size_t




+ 2
- 2
include/lol/private/math/functions.h View File

@@ -1,7 +1,7 @@
// //
// Lol Engine // Lol Engine
// //
// Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
// Copyright © 2010–2023 Sam Hocevar <sam@hocevar.net>
// //
// Lol Engine is free software. It comes without any warranty, to // Lol Engine is free software. It comes without any warranty, to
// the extent permitted by applicable law. You can redistribute it // the extent permitted by applicable law. You can redistribute it
@@ -130,7 +130,7 @@ template<typename T, typename T2 = LOL_T_FLOATING_POINT>
} }


// Round up to next power of two // Round up to next power of two
template<typename T, typename T2=LOL_T_INTEGRAL>
template<typename T, typename T2=LOL_T_UNSIGNED>
[[nodiscard]] static inline T2 bit_ceil(T x) [[nodiscard]] static inline T2 bit_ceil(T x)
{ {
#if defined __cpp_lib_int_pow2 #if defined __cpp_lib_int_pow2


Loading…
Cancel
Save