use NBL_ and update gtml

Author: tad1

3rdparty/git-version-tracking

@@ -1,8 +1,8 @@
-#ifdef __GIT_INFO_H_INCLUDED__
+#ifdef _GIT_INFO_H_INCLUDED_
 // when "git_info.h" is included
-#	define LOG(SEVERITY, FORMAT, ...) LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash, __FUNCTION__, __FILE__, __LINE__);
-#	define LOG_ERROR(FORMAT, ...) LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
+#	define NBL_LOG(SEVERITY, FORMAT, ...) NBL_LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash, __FUNCTION__, __FILE__, __LINE__);
+#	define NBL_LOG_ERROR(FORMAT, ...) NBL_LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
 #else
-#	define LOG(SEVERITY, FORMAT, ...) LOG_FUNCTION(FORMAT" [%s - %s:%d]", SEVERITY, __VA_ARGS__, __FUNCTION__, __FILE__, __LINE__);
-#	define LOG_ERROR(FORMAT, ...) LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
+#	define NBL_LOG(SEVERITY, FORMAT, ...) NBL_LOG_FUNCTION(FORMAT" [%s - %s:%d]", SEVERITY, __VA_ARGS__, __FUNCTION__, __FILE__, __LINE__);
+#	define NBL_LOG_ERROR(FORMAT, ...) NBL_LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
 #endif

include/nbl/logging_macros.h

@@ -1,3 +1,3 @@
-#undef LOG
-#undef LOG_ERROR
-#undef LOG_FUNCTION
+#undef NBL_LOG
+#undef NBL_LOG_ERROR
+#undef NBL_LOG_FUNCTION