Bläddra i källkod

HPCC-24600 Various windows build fixes

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 4 år sedan
förälder
incheckning
d7fdc4a4dd

+ 0 - 1
common/thorhelper/csvsplitter.cpp

@@ -181,7 +181,6 @@ void CSVSplitter::init(unsigned _maxColumns, size32_t _maxCsvSize, const char *q
     lengths = new unsigned [maxColumns+1];      // NB: One larger to remove some tests in main loop...
     data = new const byte * [maxColumns+1];
 
-    unsigned idx;
     if (quotes)
         addActionList(matcher, quotes, QUOTE);
     if (separators)

+ 0 - 1
dali/base/dadfs.cpp

@@ -9924,7 +9924,6 @@ public:
         {
             SocketEndpointArray existingGroupBoundEps;
             StringAttr groupDir;
-            GroupType type;
             if (!loadGroup(existing, existingGroupBoundEps, nullptr, nullptr))
             {
                 IWARNLOG("removeSpares: failed to load group: '%s'", groupName.str());

+ 2 - 0
system/jlib/jbuff.hpp

@@ -96,9 +96,11 @@ template <typename CLASS> void inline ownedMallocDoFree(CLASS *o) { free(o); }
 template <class CLASS> class OwnedMalloc : public OwnedPtrCustomFree<CLASS, ownedMallocDoFree<CLASS>>
 {
     typedef OwnedPtrCustomFree<CLASS, ownedMallocDoFree<CLASS>> PARENT;
+    typedef OwnedMalloc<CLASS> SELF;
 public:
     inline OwnedMalloc() : PARENT() { }
     inline OwnedMalloc(CLASS * _ptr) : PARENT(_ptr) { }
+    inline OwnedMalloc(SELF && _other) = default;
     explicit inline OwnedMalloc(unsigned n, bool clearMemory = false) { doAllocate(n, clearMemory); }
     inline void allocate(bool clearMemory = false)   { allocateN(1, clearMemory); }
     inline void allocateN(unsigned n, bool clearMemory = false)

+ 0 - 1
system/mp/test/mptest.cpp

@@ -1230,7 +1230,6 @@ void MPNxN(ICommunicator *comm, unsigned numStreams, size32_t perStreamMBSize, s
                     }
                     if (!async)
                     {
-                        rank_t sender;
                         for (int t: tgtRanks)
                         {
                             rank_t sender;

+ 3 - 2
thorlcr/graph/thgraphmaster.ipp

@@ -41,12 +41,13 @@ class graphmaster_decl CThorStatsCollection : public CInterface
     std::vector<OwnedMalloc<CRuntimeStatisticCollection>> nodeStats;
     const StatisticsMapping & mapping;
 public:
-    CThorStatsCollection(const StatisticsMapping & _mapping) : mapping(_mapping)
+    CThorStatsCollection(const StatisticsMapping & _mapping) : mapping(_mapping), nodeStats(queryClusterWidth())
     {
         unsigned c = queryClusterWidth();
         while (c--)
-            nodeStats.push_back(new CRuntimeStatisticCollection(mapping));
+            nodeStats[c].setown(new CRuntimeStatisticCollection(mapping));
     }
+    CThorStatsCollection(const CThorStatsCollection & other) = delete;
     void deserialize(unsigned node, MemoryBuffer & mb)
     {
         nodeStats[node]->deserialize(mb);

+ 2 - 2
tools/backupnode/backupnode.cpp

@@ -334,7 +334,7 @@ static void CompressDirectory(const char *target, unsigned numSlaves, bool compr
     ForEach (*dir)
     {
         IFile &targetFile = dir->query();
-        if (targetFile.isFile())
+        if (targetFile.isFile() == fileBool::foundYes)
         {
             if (includeFile(targetFile, numSlaves))
             {
@@ -373,7 +373,7 @@ static void CompressDirectory(const char *target, unsigned numSlaves, bool compr
                 }
             }
         }
-        else if (targetFile.isDirectory())
+        else if (targetFile.isDirectory() == fileBool::foundYes)
         {
             StringBuffer newTarget(target);
             newTarget.append(PATHSEPCHAR);