--- parser3/src/include/pa_threads.h	2001/03/19 17:42:13	1.9
+++ parser3/src/include/pa_threads.h	2001/05/17 10:42:56	1.15
@@ -5,27 +5,29 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_threads.h,v 1.9 2001/03/19 17:42:13 paf Exp $
+	$Id: pa_threads.h,v 1.15 2001/05/17 10:42:56 parser Exp $
 */
 
 #ifndef PA_THREADS_H
 #define PA_THREADS_H
 
-#ifdef HAVE_CONFIG_H
-#	include "pa_config.h"
-#endif
-
+#include "pa_config_includes.h"
 #include "pa_types.h"
 
 
 #ifdef MULTITHREAD
 
+class AutoSYNCHRONIZED;
+
 /// simple semaphore object
 class Mutex {
+	friend AutoSYNCHRONIZED;
+private:
 	uint handle;
 public:
 	Mutex();
 	~Mutex();
+private: // for AutoSYNCHRONIZED
 	void acquire();
 	void release();
 };
@@ -38,36 +40,26 @@ extern Mutex global_mutex;
 	Use it with SYNCHRONIZED macro
 */
 class AutoSYNCHRONIZED {
-	bool thread_safe;
 public:
-	AutoSYNCHRONIZED(bool athread_safe) : thread_safe(athread_safe) { 
-		if(thread_safe)
-			global_mutex.acquire(); 
-	}
-	~AutoSYNCHRONIZED() { 
-		if(thread_safe)
-			global_mutex.release(); 
-	}
+	AutoSYNCHRONIZED() { global_mutex.acquire(); }
+	~AutoSYNCHRONIZED() { global_mutex.release(); }
 };
 
 /** 
 	put it to first line of a function to ensure thread safety.
-
 	@verbatim
-	void someclass::somefunc(...) { SYNCHRONIZED(thread_safe);
-		...
-	}
+		void someclass::somefunc(...) { SYNCHRONIZED;
+			...
+		}
 	@endverbatim
 
-	considering \a thread_safe to be the object field to flag 
-	whether safety is really needed in this particular object instance
+	WARNING: don't use THROW or PTHROW with such thread safety mechanizm -
+	longjmp would leave global_mutex acquired, which is wrong!
 */
-#define SYNCHRONIZED(athread_safe) AutoSYNCHRONIZED autoSYNCHRONIZED(athread_safe)
-
-#else // not MULTITHREAD-ed
-
-#define SYNCHRONIZED(athread_safe) /* do nothing */
-
+#	define SYNCHRONIZED AutoSYNCHRONIZED autoSYNCHRONIZED
+#else
+	// not MULTITHREAD-ed, do nothing
+#	define SYNCHRONIZED
 #endif