Explorar o código

Merge pull request #5895 from afishbeck/jsonDatasetObjectRegression

HPCC-11444 Fix signature of FlushingJsonBuffer::startDataset

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman %!s(int64=11) %!d(string=hai) anos
pai
achega
a2c7e1f9da
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      common/thorhelper/roxiehelper.cpp
  2. 1 1
      common/thorhelper/roxiehelper.hpp

+ 1 - 1
common/thorhelper/roxiehelper.cpp

@@ -1102,7 +1102,7 @@ void FlushingJsonBuffer::encodeXML(const char *x, unsigned flags, unsigned len,
     appendJSONStringValue(s, NULL, len, x, true);
 }
 
-void FlushingJsonBuffer::startDataset(const char *elementName, const char *resultName, unsigned sequence, bool _extend)
+void FlushingJsonBuffer::startDataset(const char *elementName, const char *resultName, unsigned sequence, bool _extend, const IProperties *xmlns)
 {
     CriticalBlock b(crit);
     extend = _extend;

+ 1 - 1
common/thorhelper/roxiehelper.hpp

@@ -174,7 +174,7 @@ public:
     }
 
     void encodeXML(const char *x, unsigned flags=0, unsigned len=(unsigned)-1, bool utf8=false);
-    void startDataset(const char *elementName, const char *resultName, unsigned sequence, bool _extend = false);
+    void startDataset(const char *elementName, const char *resultName, unsigned sequence, bool _extend = false, const IProperties *xmlns=NULL);
     void startScalar(const char *resultName, unsigned sequence);
 };