Changes following review

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

Author: ghalliday

ecl/hql/hqlrepository.hpp

@@ -86,7 +86,7 @@ class HQL_API EclRepositoryManager
     IEclRepository * createSingleDefinitionEclRepository(const char * moduleName, const char * attrName, IFileContents * contents, bool includeInArchive);
     IEclRepository * createRepository(IEclSourceCollection * source, const char * rootScopeFullName, bool includeInArchive);
 
-    unsigned runGitCommand(StringBuffer *output, const char *args, const char *cwd, bool needCredentials);
+    unsigned runGitCommand(StringBuffer * output, const char *args, const char * cwd, bool needCredentials);
     IEclPackage * queryRepository(IIdAtom * name, const char * defaultUrl, IEclSourceCollection * overrideSource, bool includeDefinitions);
     IInterface * getGitUpdateLock(const char * path)
     {

system/jlib/jsecrets.cpp

@@ -58,6 +58,11 @@
 #include "jwt-cpp/jwt.h"
 #include "nlohmann/json.hpp"
 
+#ifdef JWT_HAS_VERIFY_MACRO
+    //Force an error if verify macro is used in any of the following code
+    #undef verify
+#endif
+
 #ifdef _USE_OPENSSL
 #include <opensslcommon.hpp>
 #include <openssl/x509v3.h>