Skip to content

Commit bb196ed

Browse files
committed
Min C++ standard is c++17 (required by Processing.h); restore flat using declarations
1 parent f3e3769 commit bb196ed

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

mode/CppMode.jar

-65 Bytes
Binary file not shown.

src/java/CppBuild.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,17 +1244,13 @@ private File writeSketchImpl(RunnerListener listener) throws IOException {
12441244
out.append("using std::unordered_map; using std::unordered_set;\n");
12451245
out.append("using std::sort; using std::shuffle; using std::reverse;\n");
12461246
out.append("using std::unique_ptr; using std::shared_ptr;\n");
1247-
out.append("using std::make_unique; using std::make_shared;\n");
12481247
out.append("using std::to_string; using std::stoi; using std::stof; using std::stod;\n");
12491248
out.append("using std::cout; using std::cerr; using std::endl;\n");
12501249
out.append("using std::ifstream; using std::ofstream; using std::stringstream;\n");
12511250
out.append("using std::move; using std::forward; using std::swap;\n");
12521251
out.append("using std::begin; using std::end;\n");
12531252
out.append("using std::accumulate; using std::transform; using std::find;\n");
12541253
out.append("using std::array; using std::optional; using std::variant;\n");
1255-
out.append("#if __cplusplus >= 202002L\n");
1256-
out.append("using std::span;\n");
1257-
out.append("#endif\n");
12581254
out.append("using std::function;\n");
12591255
out.append("using std::map; using std::set;\n");
12601256
out.append("using std::initializer_list; using std::enable_if; using std::enable_if_t;\n");
@@ -1267,6 +1263,9 @@ private File writeSketchImpl(RunnerListener listener) throws IOException {
12671263
out.append("using std::make_tuple; using std::tie; using std::apply;\n");
12681264
out.append("using std::runtime_error; using std::logic_error; using std::exception;\n");
12691265
out.append("using std::numeric_limits;\n");
1266+
out.append("#if __cplusplus >= 202002L\n");
1267+
out.append("using std::span;\n");
1268+
out.append("#endif\n");
12701269
// C++23 standard library additions -- guarded by version check
12711270
out.append("#if __cplusplus >= 202302L\n");
12721271
out.append("# if __has_include(<expected>)\n");

src/java/CppEditor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void dispose() {
5252
private static final String BUG_REPORT_URL =
5353
"https://github.com/processing-cpp/processing.cpp/issues";
5454

55-
private static final String[] CPP_STDS = {"c++98", "c++11", "c++14", "c++17", "c++20", "c++23", "c++2c"};
55+
private static final String[] CPP_STDS = {"c++17", "c++20", "c++23", "c++2c"};
5656
private static final String PREF_KEY = "cppmode.std";
5757
private JComboBox<String> stdCombo;
5858

0 commit comments

Comments
 (0)