From 66cac674a9649f95b9a64544a508ab7652e555f4 Mon Sep 17 00:00:00 2001 From: Avril Date: Sat, 28 Nov 2020 14:37:35 +0000 Subject: [PATCH] remove dependancy on libfmt --- Makefile | 2 +- include/shuffle.hpp | 10 +++++----- include/shuffle3.h | 7 ------- src/work.cpp | 2 -- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 4edb20a..b35e103 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ CXX_OPT_FLAGS?= $(OPT_FLAGS) -felide-constructors CFLAGS += $(COMMON_FLAGS) --std=gnu11 CXXFLAGS += $(COMMON_FLAGS) --std=gnu++20 -fno-exceptions -LDFLAGS += -lfmt +LDFLAGS += STRIP=strip diff --git a/include/shuffle.hpp b/include/shuffle.hpp index 289f668..b59e434 100644 --- a/include/shuffle.hpp +++ b/include/shuffle.hpp @@ -3,20 +3,20 @@ #include #include #include -#include +#include namespace rng { template inline void shuffle(R& rng, span span) { if(!span.size()) return; - fmt::print(" -> shuffling {} objects...", span.size()); + std::cout << " -> shuffling " << span.size() << " objects..."; for(std::size_t i=span.size()-1;i>0;i--) { auto j = rng.next_long(i); std::swap(span[i], span[j]); } - fmt::print(" OK\n"); + std::cout << " OK" << std::endl; } template @@ -25,7 +25,7 @@ namespace rng { if(!span.size()) return; std::vector rng_values(span.size()); - fmt::print(" -> unshuffling {} objects...", span.size()); + std::cout << " -> unshuffling " << span.size() << " objects..."; for(std::size_t i=span.size()-1;i>0;i--) rng_values.push_back(rng.next_long(i)); @@ -33,6 +33,6 @@ namespace rng { std::swap(span[i], span[rng_values.back()]); rng_values.pop_back(); } - fmt::print(" OK\n"); + std::cout << " OK" << std::endl; } } diff --git a/include/shuffle3.h b/include/shuffle3.h index d70d74f..150bed0 100644 --- a/include/shuffle3.h +++ b/include/shuffle3.h @@ -14,13 +14,6 @@ extern "C" { #define _FORCE_INLINE __attribute__((gnu_inline)) extern inline #endif - /* -#ifdef DEBUG -#define dprintf(fmt, ...) printf("[dbg @" __FILE__ "->%s:%d] " fmt "\n", __func__, __LINE__ __VA_OPT__(,) __VA_ARGS__) -#else -#define dprintf(fmt, ...) -#endif -*/ extern const char* _prog_name; #ifdef __cplusplus diff --git a/src/work.cpp b/src/work.cpp index 20c9ed4..1df52b9 100644 --- a/src/work.cpp +++ b/src/work.cpp @@ -2,8 +2,6 @@ #include #include -#include - #include #include #include