diff --git a/functional.hpp b/functional.hpp index 8392c7372e72277f5dae56de4fab5097e90dc657..891230a6ab7f145af80016d0cbaf844c8cb9a85f 100644 --- a/functional.hpp +++ b/functional.hpp @@ -116,9 +116,7 @@ namespace rlib { } this_type &flat_map(std::function<buffer_type<value_type>(const value_type &)>) { - } - }; } #endif diff --git a/sys/sio.hpp b/sys/sio.hpp index 925ff8dc5ce7bc9643dd684f378365fb24cdc7f7..5578fe4ce7ffed674d24f9fd43ced07bdde7e86b 100644 --- a/sys/sio.hpp +++ b/sys/sio.hpp @@ -709,11 +709,7 @@ namespace rlib { sendn_ex(fd, &head, sizeof(head), MSG_NOSIGNAL); sendn_ex(fd, dat.data(), head.len, MSG_NOSIGNAL); } - }; - - } // namespace rlib - #endif diff --git a/test/Makefile b/test/Makefile index 636adc017d57ab731043e1d9f208cd4ae957fd22..5eca6ea3dbc4b4b313c089ee87fb676b0181f300 100644 --- a/test/Makefile +++ b/test/Makefile @@ -22,21 +22,8 @@ MODULES=string meta trait stdio sio scope_guard XTRA_FLAGS ?= -CXXFLAGS=-I. -I../.. $(XTRA_FLAGS) STD ?= 14 -FLAGS11=-std=c++11 -FLAGS14=-std=c++14 -FLAGS17=-std=c++17 - -ifeq ($(STD),11) - CXXFLAGS := $(CXXFLAGS) $(FLAGS11) -endif -ifeq ($(STD),14) - CXXFLAGS := $(CXXFLAGS) $(FLAGS14) -endif -ifeq ($(STD),17) - CXXFLAGS := $(CXXFLAGS) $(FLAGS17) -endif +CXXFLAGS=-I. -I../.. $(XTRA_FLAGS) -std=c++$(STD) POSTFIX=$(STD)_$(CXX) diff --git a/test/src/c.fish b/test/src/c.fish deleted file mode 100644 index 61bf9f75590ea94324b2a7de1bf220d0bde5ea81..0000000000000000000000000000000000000000 --- a/test/src/c.fish +++ /dev/null @@ -1,3 +0,0 @@ -for fl in (ls *.cc) - g++ $fl -g -o /tmp/$fl.ex -std=c++17 -lr -end diff --git a/test/src/os.cc b/test/src/os.cc index 45dba7edd93ef56bdf06ee14a26e7a9b4ed2cd48..7effc055bb38715aa88ac38a71195c85649e171f 100644 --- a/test/src/os.cc +++ b/test/src/os.cc @@ -8,5 +8,4 @@ static_assert(rlib::os_info::os == rlib::os_info::os_t::LINUX); static_assert(rlib::os_info::compiler == rlib::os_info::compiler_t::GCC); int main(){ - }