properly reference std::vector (thanks, Brian Ripley)

eddelbuettel · Jul 8, 2018 · 14e95af · 14e95af
1 parent 868ad27
commit 14e95af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-08  Dirk Eddelbuettel  <edd@debian.org>
+
+	* src/wrapper_Message.cpp (rprotobuf): Properly reference std::vector
+	(as noticed by Brian Ripley with protobuf 3.6)
+
 2018-06-25  Jeroen Ooms  <jeroenooms@gmail.com>
 
     * src/Makevars.win: update Windows build to protobuf v3.5.1 to

diff --git a/src/wrapper_Message.cpp b/src/wrapper_Message.cpp
@@ -229,7 +229,7 @@ RPB_FUNCTION_1(int, METHOD(length), Rcpp::XPtr<GPB::Message> message) {
 RPB_FUNCTION_1(int, METHOD(num_extensions), Rcpp::XPtr<GPB::Message> message) {
     const GPB::Reflection* ref = message->GetReflection();
     int nexts = 0;
-    vector<const FieldDescriptor*> fields;
+    std::vector<const FieldDescriptor*> fields;
     ref->ListFields(*message, &fields);
     for (unsigned int i = 0; i < fields.size(); i++) {
         if (fields[i]->is_extension()) {