Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into require-latest-version
Browse files Browse the repository at this point in the history
  • Loading branch information
jorisvandenbossche committed Aug 19, 2024
2 parents 81ce2da + 9a2dde3 commit eca0058
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
os: ["ubuntu-latest", "macos-13", "windows-latest"]
python-version: ["3.9", "3.10", "3.11"]
dev: [false]
env:
Expand All @@ -27,7 +27,7 @@ jobs:
python-version: "3.11"
dev: true
- env: ci/environment-dev.yml
os: macos-latest
os: macos-13
python-version: "3.11"
dev: true
- env: ci/environment-dev.yml
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: debug-statements
- id: mixed-line-ending
- repo: https://github.com/psf/black
rev: 24.2.0
rev: 24.8.0
hooks:
- id: black
args: [--safe, --quiet]
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v17.0.6
rev: v18.1.8
hooks:
- id: clang-format
args: [--style=file]
Expand Down
6 changes: 3 additions & 3 deletions src/geography.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Geography {

class Point : public Geography {
public:
Point(S2GeographyPtr&& geog_ptr) : Geography(std::move(geog_ptr)){};
Point(S2GeographyPtr&& geog_ptr) : Geography(std::move(geog_ptr)) {};

inline GeographyType geog_type() const override {
return GeographyType::Point;
Expand All @@ -97,7 +97,7 @@ class Point : public Geography {

class LineString : public Geography {
public:
LineString(S2GeographyPtr&& geog_ptr) : Geography(std::move(geog_ptr)){};
LineString(S2GeographyPtr&& geog_ptr) : Geography(std::move(geog_ptr)) {};

inline GeographyType geog_type() const override {
return GeographyType::LineString;
Expand All @@ -106,7 +106,7 @@ class LineString : public Geography {

class Polygon : public Geography {
public:
Polygon(S2GeographyPtr&& geog_ptr) : Geography(std::move(geog_ptr)){};
Polygon(S2GeographyPtr&& geog_ptr) : Geography(std::move(geog_ptr)) {};

inline GeographyType geog_type() const override {
return GeographyType::Polygon;
Expand Down

0 comments on commit eca0058

Please sign in to comment.