fix(manylinux): No views::zip in GCC 12

Author: nickelpro

CMakeLists.txt

@@ -33,8 +33,8 @@ target_link_libraries(velocem PRIVATE asio::asio llhttp::llhttp_static Python3::
 target_compile_features(velocem PRIVATE cxx_std_23)
 set_target_properties(velocem PROPERTIES CXX_VISIBILITY_PRESET hidden)
 
-if(CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
-  target_compile_options(velocem PRIVATE "-Wall")
+if(WIN32)
+  target_compile_definitions(velocem PRIVATE _WIN32_WINDOWS=0x0A00)
 endif()
 
 add_subdirectory(src)

pyproject.toml

@@ -37,9 +37,6 @@ build_args = ["-j"]
 [tool.py-build-cmake.mac.cmake.options]
 "CMAKE_OSX_DEPLOYMENT_TARGET:STRING" = "10.15"
 
-[tool.py-build-cmake.windows.cmake]
-args = ["-T", "ClangCL"]
-
 [tool.py-build-cmake.windows.cmake.options]
 "VCPKG_TARGET_TRIPLET:STRING" = "x64-windows-static"
 "CMAKE_MSVC_RUNTIME_LIBRARY:STRING" = "MultiThreaded"

src/Balm.hpp

@@ -67,37 +67,6 @@ inline auto format_as(BalmStringView sv) {
   return std::string_view {sv._base.utf8, (std::size_t) sv._base.utf8_length};
 }
 
-template <std::size_t N> struct BalmTuple {
-  BalmTuple(std::function<void(BalmStringView*)> f_dealloc)
-      : f_dealloc {f_dealloc} {
-    static PyTypeObject type = []() {
-      PyTypeObject ret = PyTuple_Type;
-      ret.tp_new = nullptr;
-      ret.tp_free = nullptr;
-      ret.tp_dealloc = dealloc;
-      return ret;
-    }();
-  }
-
-private:
-  union {
-    PyTupleObject pyt_;
-    struct {
-      PyObject_VAR_HEAD;
-      std::array<PyObject*, N> data;
-    };
-  };
-
-  const std::function<void(BalmTuple*)> f_dealloc;
-
-  static void dealloc(PyObject* self) {
-    auto ptr {reinterpret_cast<BalmTuple*>(self)};
-    for(auto pyobj : ptr->data)
-      Py_DECREF(pyobj);
-    ptr->f_dealloc(ptr);
-  }
-};
-
 } // namespace velocem
 
 #endif // VELOCEM_GIL_BALM_H

src/ModVelocem.cpp

@@ -223,8 +223,14 @@ template <asio::execution::executor Ex> struct PythonApp {
 
     PyDict_SetItem(env, gPO.proto, http_minor ? gPO.http11 : gPO.http10);
 
-    for(const auto& [hdr, val] : std::views::zip(req->headers, req->values))
-      PyDict_SetItem(env, (PyObject*) &hdr.bsv, (PyObject*) &val);
+    // Switch this when we get manylinux_2_34
+    // for(const auto& [hdr, val] : std::views::zip(req->headers, req->values))
+    //   PyDict_SetItem(env, (PyObject*) &hdr.bsv, (PyObject*) &val);
+
+    for(size_t i {0}; i < req->headers.size(); ++i)
+      PyDict_SetItem(env, (PyObject*) &req->headers[i].bsv,
+          (PyObject*) &req->values[i]);
+
 
     replace_key(env, gPO.http_conlen, gPO.conlen);
     replace_key(env, gPO.http_contype, gPO.contype);