# HG changeset patch # User Paper # Date 1698259985 14400 # Node ID eab9e623eb84cbe6316b567de34ee73b96a6b153 # Parent d02fdf1d6708938bd147406989359ba6de1fe27f dep/animia: update from upstream diff -r d02fdf1d6708 -r eab9e623eb84 .hgignore --- a/.hgignore Tue Oct 24 22:01:02 2023 -0400 +++ b/.hgignore Wed Oct 25 14:53:05 2023 -0400 @@ -1,5 +1,9 @@ syntax: glob +# stupid OS X things +.DS_Store +._* + # Prerequisites *.d diff -r d02fdf1d6708 -r eab9e623eb84 dep/animia/CMakeLists.txt --- a/dep/animia/CMakeLists.txt Tue Oct 24 22:01:02 2023 -0400 +++ b/dep/animia/CMakeLists.txt Wed Oct 25 14:53:05 2023 -0400 @@ -14,6 +14,7 @@ set_target_properties(animia PROPERTIES PUBLIC_HEADER animia/animia.h CXX_STANDARD 11) target_include_directories(animia PRIVATE include) +option(BUILD_TESTS "Build tests" OFF) if(BUILD_TESTS) project(test LANGUAGES CXX) diff -r d02fdf1d6708 -r eab9e623eb84 dep/animia/include/animia.h --- a/dep/animia/include/animia.h Tue Oct 24 22:01:02 2023 -0400 +++ b/dep/animia/include/animia.h Wed Oct 25 14:53:05 2023 -0400 @@ -12,6 +12,6 @@ std::vector filter_system_files(const std::vector& source); std::unordered_map> get_all_open_files(); -} +} // namespace Animia #endif // __animia__animia_h diff -r d02fdf1d6708 -r eab9e623eb84 dep/animia/include/bsd.h --- a/dep/animia/include/bsd.h Tue Oct 24 22:01:02 2023 -0400 +++ b/dep/animia/include/bsd.h Wed Oct 25 14:53:05 2023 -0400 @@ -4,13 +4,14 @@ #include #include -namespace Animia::Unix { +namespace Animia { namespace Unix { std::vector get_all_pids(); std::string get_process_name(int pid); std::vector get_open_files(int pid); std::unordered_map> get_all_open_files(); -} +} // namespace Unix +} // namespace Animia #endif // __animia__bsd_h diff -r d02fdf1d6708 -r eab9e623eb84 dep/animia/include/linux.h --- a/dep/animia/include/linux.h Tue Oct 24 22:01:02 2023 -0400 +++ b/dep/animia/include/linux.h Wed Oct 25 14:53:05 2023 -0400 @@ -4,13 +4,14 @@ #include #include -namespace Animia::Linux { +namespace Animia { namespace Linux { std::vector get_all_pids(); std::string get_process_name(int pid); std::vector get_open_files(int pid); std::unordered_map> get_all_open_files(); -} +} // namespace Linux +} // namespace Animia #endif // __animia__linux_h diff -r d02fdf1d6708 -r eab9e623eb84 dep/animia/include/win32.h --- a/dep/animia/include/win32.h Tue Oct 24 22:01:02 2023 -0400 +++ b/dep/animia/include/win32.h Wed Oct 25 14:53:05 2023 -0400 @@ -4,7 +4,7 @@ #include #include -namespace Animia::Windows { +namespace Animia { namespace Windows { std::vector get_all_pids(); std::string get_process_name(int pid); @@ -12,6 +12,7 @@ std::vector filter_system_files(const std::vector& source); std::unordered_map> get_all_open_files(); -} +} // namespace Windows +} // namespace Animia #endif // __animia__windows_h diff -r d02fdf1d6708 -r eab9e623eb84 dep/animia/src/bsd.cpp --- a/dep/animia/src/bsd.cpp Tue Oct 24 22:01:02 2023 -0400 +++ b/dep/animia/src/bsd.cpp Wed Oct 25 14:53:05 2023 -0400 @@ -20,7 +20,7 @@ # include #endif -namespace Animia::Unix { +namespace Animia { namespace Unix { /* this is a cleaned up version of a function from... Apple? ...anyway, what it essentially does is gets the size and stuff from @@ -120,4 +120,5 @@ return map; } -} // namespace Animia::Unix +} // namespace Unix +} // namespace Animia diff -r d02fdf1d6708 -r eab9e623eb84 dep/animia/src/linux.cpp --- a/dep/animia/src/linux.cpp Tue Oct 24 22:01:02 2023 -0400 +++ b/dep/animia/src/linux.cpp Wed Oct 25 14:53:05 2023 -0400 @@ -14,7 +14,7 @@ #define PROC_LOCATION "/proc" -namespace Animia::Linux { +namespace Animia { namespace Linux { std::vector get_all_files_in_dir(const std::string& _dir) { std::vector ret; @@ -143,4 +143,5 @@ return map; } -} // namespace Animia::Linux +} // namespace Linux +} // namespace Animia diff -r d02fdf1d6708 -r eab9e623eb84 dep/animia/src/win32.cpp --- a/dep/animia/src/win32.cpp Tue Oct 24 22:01:02 2023 -0400 +++ b/dep/animia/src/win32.cpp Wed Oct 25 14:53:05 2023 -0400 @@ -48,7 +48,7 @@ SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX Handles[1]; }; -namespace Animia::Windows { +namespace Animia { namespace Windows { /* All of this BS is required on Windows. Why? */ @@ -310,4 +310,5 @@ return map; } -} // namespace Animia::Windows +} // namespace Windows +} // namespace Animia