[Rprotobuf-commits] r552 - in pkg: . src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2013-12-16 15:37:00 +0100 (Mon, 16 Dec 2013)
New Revision: 552

Modified:
   pkg/ChangeLog
   pkg/DESCRIPTION
   pkg/src/rprotobuf.h
Log:
do not use 'extern "C"' on two functions returning std::string


Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2013-12-15 23:04:49 UTC (rev 551)
+++ pkg/ChangeLog	2013-12-16 14:37:00 UTC (rev 552)
@@ -1,3 +1,8 @@
+2013-12-16  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/rprotobuf.h (RCPP_ENUM_TRAITS): Don't use extern "C" on two
+	internal functions returning a C++ type
+
 2013-12-15  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION (Version): Release 0.3.2

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-12-15 23:04:49 UTC (rev 551)
+++ pkg/DESCRIPTION	2013-12-16 14:37:00 UTC (rev 552)
@@ -1,5 +1,5 @@
 Package: RProtoBuf
-Version: 0.3.2
+Version: 0.3.2.1
 Date: $Date$
 Author: Romain Francois, Dirk Eddelbuettel and Murray Stokely
 Maintainer: Dirk Eddelbuettel <edd at debian.org>

Modified: pkg/src/rprotobuf.h
===================================================================
--- pkg/src/rprotobuf.h	2013-12-15 23:04:49 UTC (rev 551)
+++ pkg/src/rprotobuf.h	2013-12-16 14:37:00 UTC (rev 552)
@@ -145,8 +145,8 @@
 RcppExport uint32 GET_uint32( SEXP, int) ;
 RcppExport uint64 GET_uint64( SEXP, int ) ;
 RcppExport bool GET_bool( SEXP, int) ;
-RcppExport std::string GET_stdstring( SEXP, int ) ;
-RcppExport std::string GET_bytes( SEXP, int ) ;
+           std::string GET_stdstring( SEXP, int ) ;
+           std::string GET_bytes( SEXP, int ) ;
 RcppExport void CHECK_values_for_enum( GPB::FieldDescriptor*, SEXP) ;
 RcppExport void CHECK_messages( GPB::FieldDescriptor*, SEXP) ;