not right #69

SymbolixAU · May 28, 2020 · e010a35 · e010a35
1 parent 78b4961
commit e010a35
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/inst/include/jsonify/from_json/from_json.hpp b/inst/include/jsonify/from_json/from_json.hpp
@@ -83,7 +83,8 @@ namespace from_json {
     }
     case rapidjson::kFalseType: {}
     case rapidjson::kTrueType: {
-      return Rcpp::wrap< bool >( json.GetBool() );
+      //return Rcpp::wrap< bool >( json.GetBool() );
+      return Rcpp::wrap< bool >( json );
     }
     case rapidjson::kStringType: {
       return Rcpp::wrap( std::string( json.GetString() ) );

diff --git a/inst/include/jsonify/jsonify.hpp b/inst/include/jsonify/jsonify.hpp
@@ -1,9 +1,46 @@
 #ifndef R_JSONIFY_H
 #define R_JSONIFY_H
 
-#include <Rcpp.h>
 #include "rapidjson/document.h"
 
+#include <RcppCommon.h>
+
+namespace Rcpp {
+
+  template< typename T > SEXP wrap( const rapidjson::Value::ValueType& obj );
+
+namespace traits {
+
+} // traits
+} // Rcpp
+
+
+
+
+#include <Rcpp.h>
+
+
+
+namespace Rcpp {
+
+  template< typename T >
+  SEXP wrap( const rapidjson::Value::ValueType& obj) {
+    const int RTYPE = Rcpp::traits::r_sexptype_traits< T >::rtype;
+
+    return Rcpp::wrap< RTYPE >( obj.Get< T >() );
+  }
+
+
+namespace traits {
+
+
+} // traits
+} // Rcpp
+
+
+
+
+
 #include "rapidjson/writer.h"
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/prettywriter.h"