Skip to content

Commit 71da813

Browse files
committed
add temporary support c++23
1 parent 62c18a5 commit 71da813

3 files changed

Lines changed: 21 additions & 6 deletions

File tree

Library/Range/util.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,15 +464,15 @@ namespace mtd {
464464
return ranges::zip_view(std::forward<_Tp>(__e)...);
465465
}
466466
};
467-
struct _Enumerate : std::views::__adaptor::_RangeAdaptorClosure {
467+
struct _Enumerate : std::ranges::range_adaptor_closure<_Enumerate> {
468468
template <class _Tp>
469469
requires __detail::__can_zip_view<std::ranges::iota_view<size_t>, _Tp>
470470
constexpr auto operator() [[nodiscard]] (_Tp&& __e) const {
471471
return ranges::zip_view{std::views::iota(0), std::forward<_Tp>(__e)};
472472
}
473473
static constexpr bool _S_has_simple_call_op = true;
474474
};
475-
struct _Flatten : std::views::__adaptor::_RangeAdaptorClosure {
475+
struct _Flatten : std::ranges::range_adaptor_closure<_Flatten> {
476476
template <class... _Tp>
477477
requires __detail::__can_flatten_view<_Tp...>
478478
constexpr auto operator() [[nodiscard]] (_Tp&&... __e) const {

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
.DEFAULT_GOAL := help
22

3+
GXX := g++
4+
OPTION := -std=c++2b -O2 -D DEBUG -I /ac-library -Wall -Wextra -Wshadow -Wconversion -Wno-sign-conversion
5+
36
SRC ?= main.cpp
47
SRC_CORRECT ?= main_correct.cpp
58
SRC_TESTCASES ?= main_testcases.cpp
@@ -10,18 +13,17 @@ SRC_COPY_FLAT = $(BUILD_DIR)/$(SRC_FLAT:.cpp=_copy.cpp)
1013
BIN_RUN = $(BUILD_DIR)/$(SRC_FLAT:.cpp=.out)
1114
BIN_TEST := $(BUILD_DIR)/test.out
1215

13-
OPTION := -std=c++2a -O2 -D DEBUG -I /ac-library -Wall -Wextra -Wshadow -Wconversion -Wno-sign-conversion
1416
DEPENDS = $(BIN_RUN:.out=.d) $(BIN_TEST:.out=.d)
1517
HEADERS = $(shell find ./ -name "*.hpp")
1618

1719
$(SRC_COPY_FLAT): $(SRC) $(HEADERS)
1820
@python Command/inline_includes.py $< | tee $@ | xsel -bi
1921

2022
$(BIN_RUN): $(SRC) $(HEADERS)
21-
@g++-12 $(OPTION) $< -MMD -MP -o $@
23+
@$(GXX) $(OPTION) $< -MMD -MP -o $@
2224

2325
$(BIN_TEST): $(SRC) $(HEADERS)
24-
@g++-12 $(OPTION) $< -D TEST -MMD -MP -o $@
26+
@$(GXX) $(OPTION) $< -D TEST -MMD -MP -o $@
2527

2628
.PHONY: i
2729
i: ## reset
@@ -32,7 +34,7 @@ i: ## reset
3234

3335
.PHONY: y
3436
y: $(SRC_COPY_FLAT) ## yank
35-
@g++-12 $(OPTION) $(SRC_COPY_FLAT) -o tmp && rm -r tmp
37+
@# @$(GXX) $(OPTION) $(SRC_COPY_FLAT) -o tmp && rm -r tmp
3638

3739
.PHONY: r
3840
r: $(BIN_RUN) ## run

docker-compose.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: "3.9"
2+
3+
services:
4+
gcc15:
5+
image: gcc:15
6+
container_name: gcc15
7+
working_dir: /src
8+
tty: true
9+
volumes:
10+
- type: bind
11+
source: ./
12+
target: /src
13+
read_only: false

0 commit comments

Comments
 (0)