File tree Expand file tree Collapse file tree 7 files changed +42
-43
lines changed
Expand file tree Collapse file tree 7 files changed +42
-43
lines changed Original file line number Diff line number Diff line change 9797 "span" : " cpp" ,
9898 "typeindex" : " cpp" ,
9999 "valarray" : " cpp" ,
100- "regex" : " cpp"
100+ "regex" : " cpp" ,
101+ "__config" : " cpp" ,
102+ "__bit_reference" : " cpp" ,
103+ "__bits" : " cpp" ,
104+ "__debug" : " cpp" ,
105+ "__errc" : " cpp" ,
106+ "__hash_table" : " cpp" ,
107+ "__locale" : " cpp" ,
108+ "__mutex_base" : " cpp" ,
109+ "__node_handle" : " cpp" ,
110+ "__nullptr" : " cpp" ,
111+ "__split_buffer" : " cpp" ,
112+ "__string" : " cpp" ,
113+ "__threading_support" : " cpp" ,
114+ "__tree" : " cpp" ,
115+ "__tuple" : " cpp" ,
116+ "stack" : " cpp" ,
117+ "__functional_base" : " cpp"
101118 },
102119 "cmake.buildDirectory" : " ${workspaceFolder}/build/windows"
103120}
Original file line number Diff line number Diff line change @@ -11,14 +11,23 @@ build/linux/Makefile: Makefile
1111linux : build/linux/Makefile
1212 cmake --build build/linux -j ` nproc`
1313
14- build/windows/ZeroErr.sln :
14+ build/windows/ZeroErr.sln : Makefile
1515 mkdir -p build/windows
1616 cmake.exe -B build/windows -S . \
1717 -DBUILD_EXAMPLES=ON -DBUILD_TEST=ON -DDISABLE_CUDA_BUILD=OFF -T host=x64 -A x64
1818
1919windows : build/windows/ZeroErr.sln
2020 cmake.exe --build build/windows --config Debug -j ` nproc`
2121
22+ build/macosx/Makefile : Makefile
23+ mkdir -p build/macosx
24+ cmake -B build/macosx -S . -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=11 \
25+ -DBUILD_EXAMPLES=ON -DBUILD_TEST=ON -DUSE_MOLD=ON -DDISABLE_CUDA_BUILD=OFF -DENABLE_FUZZING=OFF \
26+ -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
27+
28+ macosx : build/macosx/Makefile
29+ cmake --build build/macosx -j 4
30+
2231test : linux-test windows-test fuzz-test
2332
2433cuda-test : windows
@@ -39,6 +48,8 @@ reporter: linux
3948windows-test : windows
4049 cd build/windows/test && ../examples/Debug/2_log.exe --testcase=" parsing test"
4150
51+ macosx-test : macosx
52+ cd build/macosx/test && ./unittest
4253
4354build/linux-release/Makefile : Makefile
4455 mkdir -p build/linux-release
Original file line number Diff line number Diff line change @@ -175,6 +175,9 @@ __attribute__((always_inline)) __inline__ static bool isDebuggerActive() {
175175 return false ;
176176}
177177#elif defined(__APPLE__)
178+ #include < sys/sysctl.h>
179+ #include < unistd.h>
180+ #include < iostream>
178181// The following function is taken directly from the following technical note:
179182// https://developer.apple.com/library/archive/qa/qa1361/_index.html
180183// Returns true if the current process is being debugged (either
Original file line number Diff line number Diff line change 66#include < string>
77#include < tuple> // this should be removed
88#include < type_traits>
9+ #include < iosfwd>
910
1011ZEROERR_SUPPRESS_COMMON_WARNINGS_PUSH
1112
12- // those predefines can help to avoid include too many headers
13- namespace std {
14- template <typename T>
15- class complex ;
16-
17- template <class T , class Deleter >
18- class unique_ptr ;
19-
20- template <class T >
21- class shared_ptr ;
22-
23- template <class T >
24- class weak_ptr ;
25-
26- } // namespace std
27-
2813
2914namespace zeroerr {
3015
Original file line number Diff line number Diff line change 1212#include < map>
1313#include < string>
1414#include < vector>
15+ #include < iosfwd>
1516
1617ZEROERR_SUPPRESS_COMMON_WARNINGS_PUSH
1718
1819extern const char * ZEROERR_LOG_CATEGORY;
1920
20- namespace std {
21- class mutex ;
22- }
23-
2421namespace zeroerr {
2522
2623// clang-format off
Original file line number Diff line number Diff line change 33
44#include " zeroerr/color.h"
55#include " zeroerr/internal/typetraits.h"
6-
6+ # include < complex >
77
88#ifdef __GNUG__
99#include < cxxabi.h>
Original file line number Diff line number Diff line change @@ -643,6 +643,9 @@ __attribute__((always_inline)) __inline__ static bool isDebuggerActive() {
643643 return false ;
644644}
645645#elif defined(__APPLE__)
646+ #include < sys/sysctl.h>
647+ #include < unistd.h>
648+ #include < iostream>
646649// The following function is taken directly from the following technical note:
647650// https://developer.apple.com/library/archive/qa/qa1361/_index.html
648651// Returns true if the current process is being debugged (either
@@ -724,25 +727,11 @@ __attribute__((always_inline)) __inline__ static bool isDebuggerActive() { retur
724727#include < string>
725728#include < tuple> // this should be removed
726729#include < type_traits>
730+ #include < iosfwd>
727731
728732ZEROERR_SUPPRESS_COMMON_WARNINGS_PUSH
729733
730734// those predefines can help to avoid include too many headers
731- namespace std {
732- template <typename T>
733- class complex ;
734-
735- template <class T , class Deleter >
736- class unique_ptr ;
737-
738- template <class T >
739- class shared_ptr ;
740-
741- template <class T >
742- class weak_ptr ;
743-
744- } // namespace std
745-
746735
747736namespace zeroerr {
748737
@@ -1302,7 +1291,7 @@ ZEROERR_SUPPRESS_COMMON_WARNINGS_POP
13021291
13031292
13041293
1305-
1294+ # include < complex >
13061295
13071296#ifdef __GNUG__
13081297#include < cxxabi.h>
@@ -3402,15 +3391,12 @@ std::string format(const char* fmt, T... args) {
34023391#include < map>
34033392#include < string>
34043393#include < vector>
3394+ #include < iosfwd>
34053395
34063396ZEROERR_SUPPRESS_COMMON_WARNINGS_PUSH
34073397
34083398extern const char * ZEROERR_LOG_CATEGORY;
34093399
3410- namespace std {
3411- class mutex ;
3412- }
3413-
34143400namespace zeroerr {
34153401
34163402// clang-format off
You can’t perform that action at this time.
0 commit comments