Explorar el Código

Merge pull request #6660 from ghalliday/issue12351b

HPCC-12351 Avoid compiler error - ensure both branches are const char *

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman hace 10 años
padre
commit
a26855354d
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      common/workunit/referencedfilelist.cpp

+ 1 - 1
common/workunit/referencedfilelist.cpp

@@ -334,7 +334,7 @@ IPropertyTree *ReferencedFile::getRemoteFileTree(IUserDescriptor *user, INode *r
     StringBuffer remoteLFN;
     if (remotePrefix && *remotePrefix)
         remoteLFN.append(remotePrefix).append("::").append(logicalName);
-    return queryDistributedFileDirectory().getFileTree(remoteLFN.length() ? remoteLFN : logicalName, user, remote, WF_LOOKUP_TIMEOUT, false, false);
+    return queryDistributedFileDirectory().getFileTree(remoteLFN.length() ? remoteLFN.str() : logicalName.str(), user, remote, WF_LOOKUP_TIMEOUT, false, false);
 }
 
 IPropertyTree *ReferencedFile::getSpecifiedOrRemoteFileTree(IUserDescriptor *user, INode *remote, const char *remotePrefix)