Przeglądaj źródła

Merge pull request #11134 from ghalliday/issue19638

HPCC-19638 Fix various windows compile warnings

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 7 lat temu
rodzic
commit
9dd61f8241

+ 1 - 1
common/remote/sockfile.hpp

@@ -78,7 +78,7 @@ extern REMOTE_API void setDafsEndpointPort(SocketEndpoint &ep);
 extern REMOTE_API void setDafsLocalMountRedirect(const IpAddress &ip,const char *dir,const char *mountdir);
 extern REMOTE_API ISocket *connectDafs(SocketEndpoint &ep, unsigned timeoutms); // NOTE: might alter ep.port if configured for multiple ports ...
 extern REMOTE_API ISocket *checkSocketSecure(ISocket *socket);
-class IOutputMetaData;
+interface IOutputMetaData;
 class RowFilter;
 extern REMOTE_API IFileIO *createRemoteFilteredFile(SocketEndpoint &ep, const char * filename, IOutputMetaData *actual, IOutputMetaData *projected, const RowFilter &fieldFilters, bool compressed, bool grouped, unsigned __int64 chooseNLimit);
 

+ 1 - 1
dali/base/dadfs.cpp

@@ -1909,7 +1909,7 @@ public:
         {
             CDfsLogicalFileName dlfn;
             dlfn.set(base, "dummyfilename"); // makeScopeQuery expects a lfn to a file, 'dummyfilename' will not be used
-            dlfn.makeScopeQuery(lockPath, DXB_Scope);
+            dlfn.makeScopeQuery(lockPath, true);
         }
         else
             lockPath.append(querySdsFilesRoot());

+ 1 - 1
esp/bindings/http/platform/httpbinding.cpp

@@ -490,7 +490,7 @@ void EspHttpBinding::setABoolHash(const char* csv, BoolHash& hash) const
     {
         const char* s = aList.item(i);
         bool* found = hash.getValue(s);
-        if (!found || !*found);
+        if (!found || !*found)
             hash.setValue(s, true);
     }
 }

+ 1 - 1
system/jhtree/jhtree.hpp

@@ -30,7 +30,7 @@
 #include "errorlist.h"
 
 class BloomFilter;
-class IIndexFilterList;
+interface IIndexFilterList;
 
 interface jhtree_decl IDelayedFile : public IInterface
 {