Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update patch for s2geometry #62

Merged
merged 1 commit into from
Sep 2, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions project/patches/s2geometry-0.9.0.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
diff -ur a/src/s2/encoded_uint_vector.h b/src/s2/encoded_uint_vector.h
--- a/src/s2/encoded_uint_vector.h 2019-03-04 11:53:16.000000000 -0500
+++ b/src/s2/encoded_uint_vector.h 2020-11-05 22:54:29.008722506 -0500
diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2019-03-04 16:53:16.000000000 +0000
+++ b/CMakeLists.txt 2022-09-02 11:53:09.106010146 +0000
@@ -13,7 +13,7 @@
set(CMAKE_MACOSX_RPATH TRUE)
endif()

-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# No compiler-specific extensions, i.e. -std=c++11, not -std=gnu++11.
set(CMAKE_CXX_EXTENSIONS OFF)
diff --color -ur a/src/s2/encoded_uint_vector.h b/src/s2/encoded_uint_vector.h
--- a/src/s2/encoded_uint_vector.h 2019-03-04 16:53:16.000000000 +0000
+++ b/src/s2/encoded_uint_vector.h 2022-09-02 11:53:34.894113813 +0000
@@ -20,9 +20,9 @@

#include <type_traits>
Expand Down