mirror of https://github.com/stella-emu/stella.git
Removed home-grown sharedptr class for the real thing.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3044 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena
parent
0ebe8d3f57
commit
affd95d94e
|
|
@ -29,7 +29,7 @@ FilesystemNodeZIP::FilesystemNodeZIP()
|
|||
{
|
||||
// We need a name, else the node is invalid
|
||||
AbstractFSNode* tmp = 0;
|
||||
_realNode = Common::SharedPtr<AbstractFSNode>(tmp);
|
||||
_realNode = shared_ptr<AbstractFSNode>(tmp);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
@ -77,14 +77,14 @@ FilesystemNodeZIP::FilesystemNodeZIP(const string& p)
|
|||
|
||||
AbstractFSNode* tmp =
|
||||
FilesystemNodeFactory::create(_zipFile, FilesystemNodeFactory::SYSTEM);
|
||||
_realNode = Common::SharedPtr<AbstractFSNode>(tmp);
|
||||
_realNode = shared_ptr<AbstractFSNode>(tmp);
|
||||
|
||||
setFlags(_zipFile, _virtualFile, _realNode);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
FilesystemNodeZIP::FilesystemNodeZIP(const string& zipfile, const string& virtualfile,
|
||||
Common::SharedPtr<AbstractFSNode> realnode)
|
||||
shared_ptr<AbstractFSNode> realnode)
|
||||
{
|
||||
setFlags(zipfile, virtualfile, realnode);
|
||||
}
|
||||
|
|
@ -92,7 +92,7 @@ FilesystemNodeZIP::FilesystemNodeZIP(const string& zipfile, const string& virtua
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void FilesystemNodeZIP::setFlags(const string& zipfile,
|
||||
const string& virtualfile,
|
||||
Common::SharedPtr<AbstractFSNode> realnode)
|
||||
shared_ptr<AbstractFSNode> realnode)
|
||||
{
|
||||
_zipFile = zipfile;
|
||||
_virtualFile = virtualfile;
|
||||
|
|
|
|||
|
|
@ -70,10 +70,10 @@ class FilesystemNodeZIP : public AbstractFSNode
|
|||
|
||||
private:
|
||||
FilesystemNodeZIP(const string& zipfile, const string& virtualfile,
|
||||
Common::SharedPtr<AbstractFSNode> realnode);
|
||||
shared_ptr<AbstractFSNode> realnode);
|
||||
|
||||
void setFlags(const string& zipfile, const string& virtualfile,
|
||||
Common::SharedPtr<AbstractFSNode> realnode);
|
||||
shared_ptr<AbstractFSNode> realnode);
|
||||
|
||||
private:
|
||||
/* Error types */
|
||||
|
|
@ -85,7 +85,7 @@ class FilesystemNodeZIP : public AbstractFSNode
|
|||
ZIPERR_NO_ROMS
|
||||
};
|
||||
|
||||
Common::SharedPtr<AbstractFSNode> _realNode;
|
||||
shared_ptr<AbstractFSNode> _realNode;
|
||||
string _zipFile, _virtualFile;
|
||||
string _path, _shortPath;
|
||||
zip_error _error;
|
||||
|
|
|
|||
|
|
@ -1,221 +0,0 @@
|
|||
//============================================================================
|
||||
//
|
||||
// SSSS tt lll lll
|
||||
// SS SS tt ll ll
|
||||
// SS tttttt eeee ll ll aaaa
|
||||
// SSSS tt ee ee ll ll aa
|
||||
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
|
||||
// SS SS tt ee ll ll aa aa
|
||||
// SSSS ttt eeeee llll llll aaaaa
|
||||
//
|
||||
// Copyright (c) 1995-2014 by Bradford W. Mott, Stephen Anthony
|
||||
// and the Stella Team
|
||||
//
|
||||
// See the file "License.txt" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id$
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
//============================================================================
|
||||
|
||||
#ifndef SHARED_PTR_HXX
|
||||
#define SHARED_PTR_HXX
|
||||
|
||||
#include <cassert>
|
||||
|
||||
namespace Common {
|
||||
|
||||
class SharedPtrDeletionInternal
|
||||
{
|
||||
public:
|
||||
virtual ~SharedPtrDeletionInternal() {}
|
||||
};
|
||||
|
||||
template<class T>
|
||||
class SharedPtrDeletionImpl : public SharedPtrDeletionInternal
|
||||
{
|
||||
public:
|
||||
SharedPtrDeletionImpl(T *ptr) : _ptr(ptr) {}
|
||||
~SharedPtrDeletionImpl()
|
||||
{
|
||||
// Checks if the supplied type is not just a plain
|
||||
// forward definition, taken from boost::checked_delete
|
||||
// This makes the user really aware what he tries to do
|
||||
// when using this with an incomplete type.
|
||||
typedef char completeCheck[sizeof(T) ? 1 : -1];
|
||||
(void)sizeof(completeCheck);
|
||||
delete _ptr;
|
||||
}
|
||||
|
||||
private:
|
||||
T *_ptr;
|
||||
};
|
||||
|
||||
template<class T, class D>
|
||||
class SharedPtrDeletionDeleterImpl : public SharedPtrDeletionInternal
|
||||
{
|
||||
public:
|
||||
SharedPtrDeletionDeleterImpl(T *ptr, D d) : _ptr(ptr), _deleter(d) {}
|
||||
~SharedPtrDeletionDeleterImpl() { _deleter(_ptr); }
|
||||
|
||||
private:
|
||||
T *_ptr;
|
||||
D _deleter;
|
||||
};
|
||||
|
||||
/**
|
||||
* A simple shared pointer implementation modelled after boost.
|
||||
*
|
||||
* This object keeps track of the assigned pointer and automatically
|
||||
* frees it when no more SharedPtr references to it exist.
|
||||
*
|
||||
* To achieve that the object implements an internal reference counting.
|
||||
* Thus you should try to avoid using the plain pointer after assigning
|
||||
* it to a SharedPtr object for the first time. If you still use the
|
||||
* plain pointer be sure you do not delete it on your own. You may also
|
||||
* not use the plain pointer to create a new SharedPtr object, since that
|
||||
* would result in a double deletion of the pointer sooner or later.
|
||||
*
|
||||
* Example creation:
|
||||
* Common::SharedPtr<int> pointer(new int(1));
|
||||
* would create a pointer to int. Later on usage via *pointer is the same
|
||||
* as for a normal pointer. If you need to access the plain pointer value
|
||||
* itself later on use the get method. The class also supplies a operator
|
||||
* ->, which does the same as the -> operator on a normal pointer.
|
||||
*
|
||||
* Be sure you are using new to initialize the pointer you want to manage.
|
||||
* If you do not use new for allocating, you have to supply a deleter as
|
||||
* second parameter when creating a SharedPtr object. The deleter has to
|
||||
* implement operator() which takes the pointer it should free as argument.
|
||||
*
|
||||
* Note that you have to specify the type itself not the pointer type as
|
||||
* template parameter.
|
||||
*
|
||||
* When creating a SharedPtr object from a normal pointer you need a real
|
||||
* definition of the type you want SharedPtr to manage, a simple forward
|
||||
* definition is not enough.
|
||||
*
|
||||
* The class has implicit upcast support, so if you got a class B derived
|
||||
* from class A, you can assign a pointer to B without any problems to a
|
||||
* SharedPtr object with template parameter A. The very same applies to
|
||||
* assignment of a SharedPtr<B> object to a SharedPtr<A> object.
|
||||
*
|
||||
* There are also operators != and == to compare two SharedPtr objects
|
||||
* with compatible pointers. Comparison between a SharedPtr object and
|
||||
* a plain pointer is only possible via SharedPtr::get.
|
||||
*/
|
||||
template<class T>
|
||||
class SharedPtr
|
||||
{
|
||||
#if !((__GNUC__ == 2) && (__GNUC_MINOR__ >= 95))
|
||||
template<class T2> friend class SharedPtr;
|
||||
#endif
|
||||
public:
|
||||
typedef int RefValue;
|
||||
typedef T ValueType;
|
||||
typedef T *Pointer;
|
||||
|
||||
SharedPtr() : _refCount(0), _deletion(0), _pointer(0) {}
|
||||
template<class T2> explicit SharedPtr(T2 *p) : _refCount(new RefValue(1)), _deletion(new SharedPtrDeletionImpl<T2>(p)), _pointer(p) {}
|
||||
template<class T2, class D> SharedPtr(T2 *p, D d) : _refCount(new RefValue(1)), _deletion(new SharedPtrDeletionDeleterImpl<T2, D>(p, d)), _pointer(p) {}
|
||||
|
||||
SharedPtr(const SharedPtr &r) : _refCount(r._refCount), _deletion(r._deletion), _pointer(r._pointer) { if (_refCount) ++(*_refCount); }
|
||||
template<class T2> SharedPtr(const SharedPtr<T2> &r) : _refCount(r._refCount), _deletion(r._deletion), _pointer(r._pointer) { if (_refCount) ++(*_refCount); }
|
||||
|
||||
~SharedPtr() { decRef(); }
|
||||
|
||||
SharedPtr &operator =(const SharedPtr &r)
|
||||
{
|
||||
if (r._refCount)
|
||||
++(*r._refCount);
|
||||
decRef();
|
||||
|
||||
_refCount = r._refCount;
|
||||
_deletion = r._deletion;
|
||||
_pointer = r._pointer;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
template<class T2>
|
||||
SharedPtr &operator =(const SharedPtr<T2> &r)
|
||||
{
|
||||
if (r._refCount)
|
||||
++(*r._refCount);
|
||||
decRef();
|
||||
|
||||
_refCount = r._refCount;
|
||||
_deletion = r._deletion;
|
||||
_pointer = r._pointer;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
ValueType &operator *() const { assert(_pointer); return *_pointer; }
|
||||
Pointer operator ->() const { assert(_pointer); return _pointer; }
|
||||
|
||||
/**
|
||||
* Returns the plain pointer value. Be sure you know what you
|
||||
* do if you are continuing to use that pointer.
|
||||
*
|
||||
* @return the pointer the SharedPtr object manages
|
||||
*/
|
||||
Pointer get() const { return _pointer; }
|
||||
|
||||
/**
|
||||
* Implicit conversion operator to bool for convenience, to make
|
||||
* checks like "if (sharedPtr) ..." possible.
|
||||
*/
|
||||
operator bool() const { return _pointer != 0; }
|
||||
|
||||
/**
|
||||
* Checks if the SharedPtr object is the only object refering
|
||||
* to the assigned pointer. This should just be used for
|
||||
* debugging purposes.
|
||||
*/
|
||||
bool unique() const { return refCount() == 1; }
|
||||
|
||||
/**
|
||||
* Returns the number of references to the assigned pointer.
|
||||
* This should just be used for debugging purposes.
|
||||
*/
|
||||
RefValue refCount() const { return _refCount ? *_refCount : 0; }
|
||||
#if !((__GNUC__ == 2) && (__GNUC_MINOR__ >= 95))
|
||||
private:
|
||||
#endif
|
||||
void decRef()
|
||||
{
|
||||
if (_refCount)
|
||||
{
|
||||
--(*_refCount);
|
||||
if (!*_refCount)
|
||||
{
|
||||
delete _refCount;
|
||||
delete _deletion;
|
||||
_deletion = 0;
|
||||
_refCount = 0;
|
||||
_pointer = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RefValue *_refCount;
|
||||
SharedPtrDeletionInternal *_deletion;
|
||||
T *_pointer;
|
||||
};
|
||||
|
||||
} // end of namespace Common
|
||||
|
||||
template<class T1, class T2>
|
||||
bool operator ==(const Common::SharedPtr<T1> &l, const Common::SharedPtr<T2> &r) {
|
||||
return l.get() == r.get();
|
||||
}
|
||||
|
||||
template<class T1, class T2>
|
||||
bool operator !=(const Common::SharedPtr<T1> &l, const Common::SharedPtr<T2> &r) {
|
||||
return l.get() != r.get();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -23,7 +23,6 @@
|
|||
#include <zlib.h>
|
||||
|
||||
#include "bspf.hxx"
|
||||
#include "SharedPtr.hxx"
|
||||
#include "FSNodeFactory.hxx"
|
||||
#include "FSNode.hxx"
|
||||
|
||||
|
|
@ -49,7 +48,7 @@ FilesystemNode::FilesystemNode(const string& p)
|
|||
else
|
||||
tmp = FilesystemNodeFactory::create(p, FilesystemNodeFactory::SYSTEM);
|
||||
|
||||
_realNode = Common::SharedPtr<AbstractFSNode>(tmp);
|
||||
_realNode = shared_ptr<AbstractFSNode>(tmp);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@
|
|||
* we can build upon this.
|
||||
*/
|
||||
|
||||
#include "bspf.hxx"
|
||||
#include "Array.hxx"
|
||||
#include "SharedPtr.hxx"
|
||||
|
||||
class FilesystemNode;
|
||||
class AbstractFSNode;
|
||||
|
|
@ -94,7 +94,7 @@ class FilesystemNode
|
|||
*/
|
||||
explicit FilesystemNode(const string& path);
|
||||
|
||||
virtual ~FilesystemNode() {}
|
||||
virtual ~FilesystemNode() { }
|
||||
|
||||
/**
|
||||
* Compare the name of this node to the name of another. Directories
|
||||
|
|
@ -250,7 +250,7 @@ class FilesystemNode
|
|||
string getShortPathWithExt(const string& ext) const; // FIXME - dead code
|
||||
|
||||
private:
|
||||
Common::SharedPtr<AbstractFSNode> _realNode;
|
||||
shared_ptr<AbstractFSNode> _realNode;
|
||||
FilesystemNode(AbstractFSNode* realNode);
|
||||
};
|
||||
|
||||
|
|
@ -276,7 +276,7 @@ class AbstractFSNode
|
|||
/**
|
||||
* Destructor.
|
||||
*/
|
||||
virtual ~AbstractFSNode() {}
|
||||
virtual ~AbstractFSNode() { }
|
||||
|
||||
/*
|
||||
* Indicates whether the object referred by this path exists in the
|
||||
|
|
|
|||
|
|
@ -566,7 +566,6 @@
|
|||
<ClInclude Include="..\common\PNGLibrary.hxx" />
|
||||
<ClInclude Include="SerialPortWINDOWS.hxx" />
|
||||
<ClInclude Include="SettingsWINDOWS.hxx" />
|
||||
<ClInclude Include="..\common\SharedPtr.hxx" />
|
||||
<ClInclude Include="..\common\SoundSDL2.hxx" />
|
||||
<ClInclude Include="..\common\Stack.hxx" />
|
||||
<ClInclude Include="..\common\Version.hxx" />
|
||||
|
|
@ -741,4 +740,4 @@
|
|||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -800,9 +800,6 @@
|
|||
<ClInclude Include="SettingsWINDOWS.hxx">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\common\SharedPtr.hxx">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\common\SoundSDL2.hxx">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1576,4 +1573,4 @@
|
|||
<Filter>Resource Files</Filter>
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue