Kaynağa Gözat

Move <lol/format> to <lol/std/format> for clarity

main
Sam Hocevar 11 ay önce
ebeveyn
işleme
a6236aa56e
4 değiştirilmiş dosya ile 15 ekleme ve 11 silme
  1. +2
    -2
      include/lol/private/math/matrix.ipp
  2. +2
    -2
      include/lol/private/math/transform.ipp
  3. +2
    -2
      include/lol/private/math/vector.ipp
  4. +9
    -5
      include/lol/std/format

+ 2
- 2
include/lol/private/math/matrix.ipp Dosyayı Görüntüle

@@ -1,7 +1,7 @@
// //
// Lol Engine // Lol Engine
// //
// Copyright © 2010–2024 Sam Hocevar <sam@hocevar.net>
// Copyright © 2010–2025 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
@@ -15,7 +15,7 @@
#include <cassert> #include <cassert>
#include <cmath> // std::tan #include <cmath> // std::tan
#include <algorithm> // std::max #include <algorithm> // std::max
#include <lol/format> // std::format
#include <lol/std/format> // std::format


namespace lol namespace lol
{ {


+ 2
- 2
include/lol/private/math/transform.ipp Dosyayı Görüntüle

@@ -1,7 +1,7 @@
// //
// Lol Engine // Lol Engine
// //
// Copyright © 2010–2024 Sam Hocevar <sam@hocevar.net>
// Copyright © 2010–2025 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
@@ -13,7 +13,7 @@
#pragma once #pragma once


#include <cmath> // std::cos, std::sin #include <cmath> // std::cos, std::sin
#include <lol/format> // std::format
#include <lol/std/format> // std::format


namespace lol namespace lol
{ {


+ 2
- 2
include/lol/private/math/vector.ipp Dosyayı Görüntüle

@@ -1,7 +1,7 @@
// //
// Lol Engine // Lol Engine
// //
// Copyright © 2010–2024 Sam Hocevar <sam@hocevar.net>
// Copyright © 2010–2025 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
@@ -12,7 +12,7 @@


#pragma once #pragma once


#include <lol/format> // std::format
#include <lol/std/format> // std::format


namespace lol namespace lol
{ {


include/lol/format → include/lol/std/format Dosyayı Görüntüle

@@ -1,7 +1,7 @@
// //
// Lol Engine // Lol Engine
// //
// Copyright © 2010–2024 Sam Hocevar <sam@hocevar.net>
// Copyright © 2010–2025 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
@@ -12,6 +12,7 @@


#pragma once #pragma once


// Assume std::format is available, then check for exceptions
#define LOL_HAS_STD_FORMAT 1 #define LOL_HAS_STD_FORMAT 1


#if !defined __SCE__ #if !defined __SCE__
@@ -21,20 +22,23 @@
# endif # endif
#endif #endif


#if defined __SCE__
# undef LOL_HAS_STD_FORMAT
# include <cstdio>
#if defined __SCE__ // SCE platforms do not have <format>, so check for C++20 support
# if !_HAS_CXX20
# undef LOL_HAS_STD_FORMAT
# include <cstdio>
// These functions are used unconditionally in libfmt // These functions are used unconditionally in libfmt
static inline void flockfile(FILE* f) { } static inline void flockfile(FILE* f) { }
static inline void funlockfile(FILE* f) { } static inline void funlockfile(FILE* f) { }
static inline int getc_unlocked(FILE*) { return 0; } static inline int getc_unlocked(FILE*) { return 0; }
static inline int putc_unlocked(int, FILE*) { return 0; } static inline int putc_unlocked(int, FILE*) { return 0; }
# endif
#endif #endif


// Include <format> if everything went well, otherwise use the 3rd party implementation
#if defined LOL_HAS_STD_FORMAT #if defined LOL_HAS_STD_FORMAT
# include <format> # include <format>
#else #else
# define FMT_HEADER_ONLY # define FMT_HEADER_ONLY
# include "3rdparty/fmt/include/fmt/format.h"
# include "../3rdparty/fmt/include/fmt/format.h"
namespace std { using fmt::format; } namespace std { using fmt::format; }
#endif #endif

Yükleniyor…
İptal
Kaydet