Skip to content

Commit

Permalink
remove systemrequiremetns
Browse files Browse the repository at this point in the history
  • Loading branch information
dcooley committed May 20, 2024
1 parent 878de1a commit aedf1f6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
13 changes: 8 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: geojsonsf
Type: Package
Title: GeoJSON to Simple Feature Converter
Version: 2.0.4
Date: 2023-06-24
Date: 2024-05-21
Authors@R: c(
person("David", "Cooley", ,"[email protected]", role = c("aut", "cre"))
)
Expand All @@ -12,12 +12,11 @@ URL: https://github.com/SymbolixAU/geojsonsf
BugReports: https://github.com/SymbolixAU/geojsonsf/issues
Encoding: UTF-8
LazyData: true
Depends: R (>= 3.3.0)
SystemRequirements: C++11
Depends: R (>= 4.0.0)
LinkingTo:
geometries,
jsonify (>= 1.1.1),
rapidjsonr (>= 1.2.0),
jsonify (>= 1.2.3),
rapidjsonr (>= 1.2.1),
Rcpp,
sfheaders (>= 0.2.2)
Imports:
Expand All @@ -30,3 +29,7 @@ Suggests:
rmarkdown,
tinytest
VignetteBuilder: knitr
remotes:
https://github.com/SymbolixAU/jsonify
https://github.com/SymbolixAU/rapidjsonr

4 changes: 2 additions & 2 deletions inst/include/geojsonsf/geojson/geojson_properties.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,12 @@ namespace geojson_properties {
// don't do anything...
} else if (value_type == "Object") {

Value v = p.value.GetObject();
Value& v = p.value.GetObject();
nested_json_to_string(v, type, properties, row_index, key);

} else if (value_type == "Array") {

Value v = p.value.GetArray();
Value& v = p.value.GetArray();
nested_json_to_string(v, type, properties, row_index, key);

} else {
Expand Down
2 changes: 0 additions & 2 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
CXX_STD = CXX11

PKG_CXXFLAGS = -I../inst/include/
PKG_CPPFLAGS=-DSTRICT_R_HEADERS
2 changes: 0 additions & 2 deletions src/Makevars.win
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
CXX_STD = CXX11

PKG_CXXFLAGS = -I../inst/include/
PKG_CPPFLAGS=-DSTRICT_R_HEADERS

0 comments on commit aedf1f6

Please sign in to comment.