File tree 2 files changed +7
-8
lines changed
2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,8 @@ export MACOSX_DEPLOYMENT_TARGET=$(LIBVER)
3
3
4
4
CXX =clang++
5
5
CPPFLAGS += -MMD -MP
6
- CXXFLAGS += --std=c++20 -pedantic-errors -Weverything -Wno-c++98-compat -Wno-pre-c++20-compat-pedantic -Wno-poison-system-directories
6
+ CXXFLAGS := --std=c++20
7
+ EXTRA_CXXFLAGS := -pedantic-errors -Weverything -Wno-c++98-compat -Wno-pre-c++20-compat-pedantic -Wno-poison-system-directories
7
8
LDFLAGS += -Llib -fvisibility=default -fPIC
8
9
LDLIBS += -lgetargv
9
10
@@ -14,13 +15,13 @@ run: bin/main
14
15
bin/main
15
16
16
17
lib/libgetargv++.dylib : obj/argv.o obj/argvargc.o | lib
17
- $(CXX ) $(CXXFLAGS ) $(LDFLAGS ) $(LDLIBS ) -dynamiclib $^ -o $@
18
+ $(CXX ) $(EXTRA_CXXFLAGS ) $( CXXFLAGS ) $(LDFLAGS ) $(LDLIBS ) -dynamiclib $^ -o $@
18
19
19
20
bin/main : lib/libgetargv++.dylib obj/main.o | bin
20
- $(CXX ) $(CXXFLAGS ) $(LDFLAGS ) $(LDLIBS ) -lgetargv++ -fPIE $^ -o $@
21
+ $(CXX ) $(EXTRA_CXXFLAGS ) $( CXXFLAGS ) $(LDFLAGS ) $(LDLIBS ) -lgetargv++ -fPIE $^ -o $@
21
22
22
23
obj/% .o : src/% .cpp | obj
23
- $(CXX ) $(CPPFLAGS ) $(CXXFLAGS ) -c $^ -o $@
24
+ $(CXX ) $(CPPFLAGS ) $(CXXFLAGS ) $( EXTRA_CXXFLAGS ) -c $^ -o $@
24
25
25
26
bin lib obj :
26
27
mkdir -p $@
Original file line number Diff line number Diff line change @@ -12,10 +12,6 @@ namespace ffi {
12
12
13
13
// TODO: tests
14
14
15
- #if defined(__cplusplus) && (__cplusplus < 201703L)
16
- #error "C++ versions less than C++17 are not supported."
17
- #endif
18
-
19
15
namespace Getargv {
20
16
21
17
struct Argv : protected ffi ::ArgvResult {
@@ -27,6 +23,7 @@ struct Argv : protected ffi::ArgvResult {
27
23
bool nuls) noexcept (false );
28
24
29
25
Argv (Argv &r) = delete ;
26
+ Argv (Argv &&r) = default ;
30
27
Argv (const ffi::ArgvResult &r);
31
28
~Argv ();
32
29
@@ -46,6 +43,7 @@ struct ArgvArgc : protected ffi::ArgvArgcResult {
46
43
static std::vector<std::string> as_string_array (pid_t pid) noexcept (false );
47
44
48
45
ArgvArgc (ArgvArgc &r) = delete ;
46
+ ArgvArgc (ArgvArgc &&r) = default ;
49
47
ArgvArgc (const ffi::ArgvArgcResult &r);
50
48
~ArgvArgc ();
51
49
You can’t perform that action at this time.
0 commit comments