From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 14 Jul 2020 18:51:32 +0000 (+0200)
Subject: Disable LOCK_GUARD macro
X-Git-Tag: Release-11.3.2~1401
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41c0034196a55ab8aee2890854cbe1ddfd41695c;p=thirdparty%2Fbacula.git

Disable LOCK_GUARD macro
---

diff --git a/bacula/src/lib/lockmgr.h b/bacula/src/lib/lockmgr.h
index 21eeec24a5..690f1499c0 100644
--- a/bacula/src/lib/lockmgr.h
+++ b/bacula/src/lib/lockmgr.h
@@ -319,8 +319,8 @@ public:
 };
 
 // Do magic! Creates a unique name using the line number, this need two level
-#define _DO_JOIN( symbol1, symbol2 ) _DO_JOIN2( symbol1, symbol2 )
-#define _DO_JOIN2( symbol1, symbol2 ) symbol1##symbol2
+//#define _DO_JOIN( symbol1, symbol2 ) _DO_JOIN2( symbol1, symbol2 )
+//#define _DO_JOIN2( symbol1, symbol2 ) symbol1##symbol2
 
 /* You can check it by creating a variable with the expected name and see if the
  * compiler complain, for example
@@ -328,8 +328,12 @@ public:
  * > lock_guard lock_guard_123(mutex);
  */
 
-#define LOCK_GUARD(mutex) lock_guard _DO_JOIN(lock_guard_, __LINE__) (mutex, __FILE__, __LINE__)
+//FIXME: It creates a loop
+//#define LOCK_GUARD(mutex) lock_guard _DO_JOIN(lock_guard_, __LINE__) (mutex, __FILE__, __LINE__)
+
+#define LOCK_GUARD(mutex) lock_guard b_lg_mutex(mutex)
+
 // If you have collision anyway, use the "postfix" version with a name you have chosen
-#define LOCK_GUARD_POSTFIX(mutex, postfix) lock_guard _DO_JOIN2(lock_guard_, postfix) (mutex, __FILE__, __LINE__)
+//#define LOCK_GUARD_POSTFIX(mutex, postfix) lock_guard _DO_JOIN2(lock_guard_, postfix) (mutex, __FILE__, __LINE__)
 
 #endif  /* LOCKMGR_H */