libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from lioncash/fmt 

Global: Remove compatibility formatting define for size_t
This commit is contained in:
Phillip Stephens 2019-10-20 18:40:23 -07:00 committed by GitHub
parent 9a2277091f 93dacd4231
commit ed83cc0f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
atdna/test.cpp
View File

@ -1,5 +1,7 @@
#include "test.hpp" #include "test.hpp"
#include "athena/MemoryWriter.hpp"
#include <athena/MemoryWriter.hpp>
#include <fmt/format.h>
#define EXPECTED_BYTES 281 #define EXPECTED_BYTES 281
@ -13,11 +15,14 @@ int main(int argc, const char** argv) {
athena::io::MemoryCopyWriter w(nullptr, binSize); athena::io::MemoryCopyWriter w(nullptr, binSize);
atInt64 pos = w.position(); atInt64 pos = w.position();
file.write(w); file.write(w);
bool pass = !w.hasError() && w.position() - pos == binSize && binSize == EXPECTED_BYTES;
if (pass) const bool pass = !w.hasError() && w.position() - pos == binSize && binSize == EXPECTED_BYTES;
printf("[PASS] %" PRISize " bytes written\n", size_t(w.position() - pos)); if (pass) {
else fmt::print(fmt("[PASS] {} bytes written\n"), size_t(w.position() - pos));
printf("[FAIL] %" PRISize " bytes written; %" PRISize " bytes sized; %d bytes expected\n", } else {
size_t(w.position() - pos), binSize, EXPECTED_BYTES); fmt::print(fmt("[FAIL] {} bytes written; {} bytes sized; {} bytes expected\n"), size_t(w.position() - pos), binSize,
EXPECTED_BYTES);
}
return pass ? 0 : 1; return pass ? 0 : 1;
} }

8
include/athena/Global.hpp
View File

@ -30,14 +30,8 @@
#if !defined(S_ISLNK) #if !defined(S_ISLNK)
#define S_ISLNK(m) 0 #define S_ISLNK(m) 0
#endif #endif
#endif // _MSC_VER
#define PRISize "Iu"
#else
#define PRISize "zu"
#endif
// clang-format off // clang-format off
#ifndef AT_PRETTY_FUNCTION #ifndef AT_PRETTY_FUNCTION
# if defined(__PRETTY_FUNCTION__) || defined(__GNUC__) # if defined(__PRETTY_FUNCTION__) || defined(__GNUC__)