okay then

bbrk24 · Feb 25, 2024 · 9d3de1e · 9d3de1e
1 parent 84cb44d
commit 9d3de1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/lint-cpp-builds.yml b/.github/workflows/lint-cpp-builds.yml
@@ -43,8 +43,5 @@ jobs:
           arch: ${{ matrix.cmd_arch }}
       - name: Invoke MSVC
         shell: pwsh
-        # Set warning 6031 to level 4 and check external headers at level 3, otherwise the STL header <tuple> emits
-        # warning C6031. Set warning 5219 (implicit conversion, possible loss of data) as an error.
-        run: >+
-          cl .\src\*.cpp /EHsc /DVERSION=0.0.0 /DNDEBUG /std:c++20 /MTd /analyze /external:anglebrackets /external:W3
-          /W4 /w46031 /we5219 /WX
+        run: |
+          cl .\src\*.cpp /EHsc /DVERSION=0.0.0 /DNDEBUG /std:c++20 /MTd /analyze /W4 /WX /we5219
diff --git a/src/input.cpp b/src/input.cpp
@@ -52,7 +52,8 @@ static constexpr const char* FLAGS_HELP =
     "\t--null, -z       \tRead the program until null terminator instead of EOF.";
 
 namespace flag_container {
-static CONSTINIT_LAMBDA std::tuple<NONNULL_PTR(const char), char, void (*)(flags&) NOEXCEPT_T> FLAGS[] = {
+// MSVC gets mad if I try to store a NONNULL_PTR in a tuple. Wish I knew why.
+static CONSTINIT_LAMBDA std::tuple<const char*, char, void (*)(flags&) NOEXCEPT_T> FLAGS[] = {
     { "null", 'z', [](flags& f) NOEXCEPT_T { f.null_terminated = true; } },
     { "debug", 'd', [](flags& f) NOEXCEPT_T { f.debug = true; } },
     { "ascii", 'a', [](flags& f) NOEXCEPT_T { f.assume_ascii = true; } },