amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed another smart pointer bug (assignment operator copied ref count);

Browse Source 
Fixed symbol editor grid

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@385 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-05-16 19:18:16 +00:00
parent 738f5f962e
commit d2fe3b6ba0
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/symbol/control.cpp
+2 -2
View File
@@ -150,9 +150,9 @@ void SymbolControl::draw(DC& dc) {
// draw grid
if (settings.symbol_grid) {
wxSize s = dc.GetSize();
int lines = settings.symbol_grid_size;
double lines = settings.symbol_grid_size;
for (int i = 0 ; i <= lines ; ++i) {
int x = (int) rotation.trS(i/lines-0.0001);
int x = floor(rotation.trS(i/lines-0.0001));
//dc.SetPen(Color(0, i%5 == 0 ? 64 : 31, 0));
//dc.SetPen(Color(i%5 == 0 ? 64 : 31, 0, 0));
dc.SetLogicalFunction(wxAND);
src/util/smart_ptr.hpp
+13 -20
View File
@@ -160,7 +160,15 @@ inline shared_ptr<T> new_shared9(const A0& a0, const A1& a1, const A2& a2, const
template <typename T> class IntrusivePtrBase {
public:
inline IntrusivePtrBase() : ref_count(0) {}
inline IntrusivePtrBase(const IntrusivePtrBase&) : ref_count(0) {} // don't copy construct the reference count!
// don't copy construct the reference count!
inline IntrusivePtrBase(const IntrusivePtrBase&) : ref_count(0) {}
// don't assign the reference count!
inline void operator = (const IntrusivePtrBase&) { }
protected:
/// Delete this object, can be overloaded
inline void destroy() {
delete static_cast<T*>(this);
}
private:
AtomicInt ref_count;
template <typename T> friend void intrusive_ptr_add_ref(IntrusivePtrBase*);
@@ -172,7 +180,7 @@ inline shared_ptr<T> new_shared9(const A0& a0, const A1& a1, const A2& a2, const
}
template <typename T> inline void intrusive_ptr_release(IntrusivePtrBase<T>* p) {
if (--p->ref_count == 0) {
delete static_cast<T*>(p);
static_cast<T*>(p)->destroy();
}
}
@@ -187,32 +195,17 @@ inline shared_ptr<T> new_shared9(const A0& a0, const A1& a1, const A2& a2, const
// ----------------------------------------------------------------------------- : Intrusive pointer base : with delete
/// Base class for objects wishing to use intrusive_ptrs, using a manual delete function
class IntrusivePtrBaseWithDelete {
class IntrusivePtrBaseWithDelete : public IntrusivePtrBase<IntrusivePtrBaseWithDelete> {
public:
inline IntrusivePtrBaseWithDelete() : ref_count(0) {}
inline IntrusivePtrBaseWithDelete(const IntrusivePtrBaseWithDelete&)
: ref_count(0) {} // don't copy construct the reference count!
virtual ~IntrusivePtrBaseWithDelete() {}
protected:
/// Delete this object
virtual void destroy() {
delete this;
}
private:
AtomicInt ref_count;
friend void intrusive_ptr_add_ref(IntrusivePtrBaseWithDelete*);
friend void intrusive_ptr_release(IntrusivePtrBaseWithDelete*);
template <typename T> friend void intrusive_ptr_release(IntrusivePtrBase<T>*);
};
inline void intrusive_ptr_add_ref(IntrusivePtrBaseWithDelete* p) {
++p->ref_count;
}
inline void intrusive_ptr_release(IntrusivePtrBaseWithDelete* p) {
if (--p->ref_count == 0) {
p->destroy();
}
}
#else
#define DECLARE_POINTER_TYPE DECLARE_SHARED_POINTER_TYPE
#define intrusive_ptr shared_ptr
@@ -235,7 +228,7 @@ inline shared_ptr<T> new_shared9(const A0& a0, const A1& a1, const A2& a2, const
virtual ~IntrusivePtrVirtualBase() {}
};
class IntrusivePtrBaseWithDelete {
class IntrusivePtrBaseWithDelete : public IntrusivePtrBase<IntrusivePtrBaseWithDelete> {
public:
virtual ~IntrusivePtrBaseWithDelete() {}
protected: