X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_handle.h;h=393894cc0baf1e40ccf936d5857fac31146dbe20;hb=f83c48489a30958935cdab2e9f5b7c34bd72b390;hp=862c9146462a8565ca2649a4c600eddf1c6c9379;hpb=9fc439081f4226774682129daa12d25f5ae3dfcb;p=synfig.git

diff --git a/ETL/trunk/ETL/_handle.h b/ETL/trunk/ETL/_handle.h
index 862c914..393894c 100644
--- a/ETL/trunk/ETL/_handle.h
+++ b/ETL/trunk/ETL/_handle.h
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002 Robert B. Quattlebaum Jr.
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -32,15 +32,8 @@
 
 /* === H E A D E R S ======================================================= */
 
-// include the next line in an attempt to increase stability
-#define ETL_LOCK_REFCOUNTS
-
 #include <cassert>
 
-#ifdef ETL_LOCK_REFCOUNTS
-#  include "_mutex_simple.h"
-#endif
-
 /* === M A C R O S ========================================================= */
 
 /* === T Y P E D E F S ===================================================== */
@@ -231,7 +224,7 @@ public:
 	swap(handle<value_type> &x)
 	{
 		pointer ptr=x.obj;
-		x.obj=x.get();
+		x.obj=obj;
 		obj=ptr;
 		return *this;
 	}
@@ -632,7 +625,7 @@ public:
 	{
 		assert(0);
 		pointer ptr=x.obj;
-		x.obj=x.get();
+		x.obj=obj;
 		obj=ptr;
 		return *this;
 	}
@@ -714,7 +707,7 @@ public:
 	swap(loose_handle<value_type> &x)
 	{
 		pointer ptr=x.obj;
-		x.obj=x.get();
+		x.obj=obj;
 		obj=ptr;
 		return *this;
 	}