From 634e8ac06539d81dd325bf17635ab029ec129717 Mon Sep 17 00:00:00 2001 From: ruanshudong Date: Tue, 12 Dec 2023 17:17:23 +0800 Subject: [PATCH] update tarscpp fix __FILENAME__ --- NodeServer/util.h | 10 +++++----- tarscpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NodeServer/util.h b/NodeServer/util.h index 129fd202..0914da22 100644 --- a/NodeServer/util.h +++ b/NodeServer/util.h @@ -22,11 +22,11 @@ using namespace tars; -#if TARGET_PLATFORM_WINDOWS -#define __FILENAME__ (strrchr(__FILE__, '\\') ? (strrchr(__FILE__, '\\') + 1):__FILE__) -#else -#define __FILENAME__ (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1):__FILE__) -#endif +//#if TARGET_PLATFORM_WINDOWS +//#define __FILENAME__ (strrchr(__FILE__, '\\') ? (strrchr(__FILE__, '\\') + 1):__FILE__) +//#else +//#define __FILENAME__ (strrchr(__FILE__, '/') ? (strrchr(__FILE__, '/') + 1):__FILE__) +//#endif #define FILE_FUN __FILENAME__<<":"<<__FUNCTION__<<":"<<__LINE__<<"|" #define FILE_FUN_STR TC_Common::tostr(__FILENAME__)+":"+TC_Common::tostr(__FUNCTION__)+":"+TC_Common::tostr(__LINE__)+"|" diff --git a/tarscpp b/tarscpp index 19875423..82d28148 160000 --- a/tarscpp +++ b/tarscpp @@ -1 +1 @@ -Subproject commit 19875423ddbb56f43c3d66c2b4f9795d639ee93f +Subproject commit 82d28148bdd336195d1aa50a6ce712e590b9e9f4