Browse Source

Merge branch 'candidate-6.4.0' (#9807)

Fix mismerge in R plugin

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 8 years ago
parent
commit
67142aca1a
1 changed files with 1 additions and 2 deletions
  1. 1 2
      plugins/Rembed/Rembed.cpp

+ 1 - 2
plugins/Rembed/Rembed.cpp

@@ -248,7 +248,7 @@ static void getFieldNames(Rcpp::CharacterVector &namevec, const RtlTypeInfo *typ
     {
         const RtlFieldInfo *child = *fields;
         // MORE - nested records may make this interesting
-        namevec.push_back(child->name->queryStr());
+        namevec.push_back(child->name);
         fields++;
     }
 }
@@ -338,7 +338,6 @@ public:
     }
     virtual void processInt(__int64 value, const RtlFieldInfo * field) override
     {
-        namevec.push_back(field->name->queryStr());
         if (inSet)
             theIntSet[setIndex++] = (long int) value;
         else