projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'genete_master'
[synfig.git]
/
ETL
/
trunk
/
ETL
/
_handle.h
diff --git
a/ETL/trunk/ETL/_handle.h
b/ETL/trunk/ETL/_handle.h
index
0137f8f
..
393894c
100644
(file)
--- a/
ETL/trunk/ETL/_handle.h
+++ b/
ETL/trunk/ETL/_handle.h
@@
-224,7
+224,7
@@
public:
swap(handle<value_type> &x)
{
pointer ptr=x.obj;
swap(handle<value_type> &x)
{
pointer ptr=x.obj;
- x.obj=
x.get()
;
+ x.obj=
obj
;
obj=ptr;
return *this;
}
obj=ptr;
return *this;
}
@@
-625,7
+625,7
@@
public:
{
assert(0);
pointer ptr=x.obj;
{
assert(0);
pointer ptr=x.obj;
- x.obj=
x.get()
;
+ x.obj=
obj
;
obj=ptr;
return *this;
}
obj=ptr;
return *this;
}
@@
-707,7
+707,7
@@
public:
swap(loose_handle<value_type> &x)
{
pointer ptr=x.obj;
swap(loose_handle<value_type> &x)
{
pointer ptr=x.obj;
- x.obj=
x.get()
;
+ x.obj=
obj
;
obj=ptr;
return *this;
}
obj=ptr;
return *this;
}