Fix broken pywraps2 build (#216)

Broken by #212.
google · Nov 8, 2021 · 2a87778 · 2a87778
1 parent 67747db
commit 2a87778
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/python/s2.i b/src/python/s2.i
@@ -3,14 +3,13 @@
 %include "stdint.i"
 
 %template() std::vector<unsigned long long>;
-%template() std::vector<string>;
+%template() std::vector<std::string>;
 %template() std::vector<S2CellId>;
 %template() std::vector<S2Point>;
 %template() std::vector<S2LatLng>;
 
 %apply int {int32};
 %apply unsigned long long {uint64};
-%apply std::string {string};
 %apply std::vector<unsigned long long> const & {std::vector<uint64> const &};
 
 // Standard Google convention is to ignore all functions and methods, and

diff --git a/src/python/s2_common.i b/src/python/s2_common.i
@@ -654,7 +654,7 @@ class S2Point {
 
 %define USE_STREAM_INSERTOR_FOR_STR(type)
   %extend type {
-    string __str__() {
+    std::string __str__() {
       std::ostringstream output;
       output << *self << std::ends;
       return output.str();