From ed145c944065ac6802ce91b0e7bc06010cf42c56 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Tue, 18 Mar 2025 06:12:54 -0400 Subject: [PATCH 1/6] Testing modules --- fgl_cmake_modules | 2 +- include/fgl/defines.hpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fgl_cmake_modules b/fgl_cmake_modules index 1d3efaf..9b3cdc0 160000 --- a/fgl_cmake_modules +++ b/fgl_cmake_modules @@ -1 +1 @@ -Subproject commit 1d3efaf2bcdcefd7ff312733e1eda7933e8c24d6 +Subproject commit 9b3cdc0c131400a4f14f42c1cd07ba14b07ba1e0 diff --git a/include/fgl/defines.hpp b/include/fgl/defines.hpp index 1bb1e0f..c8e90a8 100644 --- a/include/fgl/defines.hpp +++ b/include/fgl/defines.hpp @@ -55,8 +55,12 @@ #ifndef NDEBUG #include -#define FGL_ASSERT( test, msg ) assert( ( test ) && "msg" ); -//if ( !( test ) ) throw std::runtime_error( msg ); +#define FGL_ASSERT( test, msg ) \ + if ( !( test ) ) \ + { \ + throw std::runtime_error( msg ); \ + std::abort(); \ + } #else #define FGL_ASSERT( test, msg ) #endif From ad4bec0d84f17073ae4391e55b43cf09eb187847 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Tue, 18 Mar 2025 06:58:03 -0400 Subject: [PATCH 2/6] Testing modules --- fgl_cmake_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fgl_cmake_modules b/fgl_cmake_modules index 9b3cdc0..20057c3 160000 --- a/fgl_cmake_modules +++ b/fgl_cmake_modules @@ -1 +1 @@ -Subproject commit 9b3cdc0c131400a4f14f42c1cd07ba14b07ba1e0 +Subproject commit 20057c3c5c0f062b6bbf573cdc32506dcb1f7cd8 From 2d719023c0744a4b435b6a2f9179b89aa6a24927 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Sat, 22 Mar 2025 21:01:52 -0400 Subject: [PATCH 3/6] Update fgl_cmake_modules in libFGL dependencies --- fgl_cmake_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fgl_cmake_modules b/fgl_cmake_modules index 20057c3..48e64f2 160000 --- a/fgl_cmake_modules +++ b/fgl_cmake_modules @@ -1 +1 @@ -Subproject commit 20057c3c5c0f062b6bbf573cdc32506dcb1f7cd8 +Subproject commit 48e64f27a2cfff1b4211259402b49f942af53250 From 2c9a03aa467d834e7082d9330cd2947eeb5e9153 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Sat, 22 Mar 2025 21:02:07 -0400 Subject: [PATCH 4/6] Add size.hpp utility for human-readable size formatting --- include/fgl/size.hpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 include/fgl/size.hpp diff --git a/include/fgl/size.hpp b/include/fgl/size.hpp new file mode 100644 index 0000000..fe59746 --- /dev/null +++ b/include/fgl/size.hpp @@ -0,0 +1,23 @@ +// +// Created by kj16609 on 3/21/25. +// +#pragma once + +#include +#include +#include +#include + +namespace fgl::size +{ + +std::string toHuman( std::size_t size ) +{ + constexpr std::size_t mod { 1024 }; + if ( size < mod ) return std::format( "{}B", size ); + if ( size < std::pow( mod, 2 ) ) return std::format( "{}KiB", static_cast< int >( size / mod ) ); + if ( size < std::pow( mod, 3 ) ) return std::format( "{}MiB", static_cast< int >( size / std::pow( mod, 2 ) ) ); + if ( size < std::pow( mod, 4 ) ) return std::format( "{}GiB", static_cast< int >( size / std::pow( mod, 3 ) ) ); + return std::format( "{}TiB", static_cast< int >( size / std::pow( mod, 4 ) ) ); +} +} // namespace fgl::size \ No newline at end of file From d38f296d7c8a3a5d5f8e7862c3ead6408cc049aa Mon Sep 17 00:00:00 2001 From: kj16609 Date: Fri, 2 May 2025 07:45:28 -0400 Subject: [PATCH 5/6] Bump submodules --- fgl_cmake_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fgl_cmake_modules b/fgl_cmake_modules index 48e64f2..f71bd41 160000 --- a/fgl_cmake_modules +++ b/fgl_cmake_modules @@ -1 +1 @@ -Subproject commit 48e64f27a2cfff1b4211259402b49f942af53250 +Subproject commit f71bd41f623956e61680c10f2fdcb1a5459c26de From c45e8fa25d02372de5e7b6bac1c4ef6e0baddf1e Mon Sep 17 00:00:00 2001 From: kj16609 Date: Fri, 2 May 2025 07:45:59 -0400 Subject: [PATCH 6/6] Bump submodules --- fgl_cmake_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fgl_cmake_modules b/fgl_cmake_modules index f71bd41..79f6419 160000 --- a/fgl_cmake_modules +++ b/fgl_cmake_modules @@ -1 +1 @@ -Subproject commit f71bd41f623956e61680c10f2fdcb1a5459c26de +Subproject commit 79f64194d69c1b0c09169fe7bff3471bb8f9ad64