ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am c6c6ab50: Merge "Implement C++11 move semantics for android::FileMap"

Browse source 
* commit 'c6c6ab50bc11d55f3135312ceccbcf0c400b437e':
  Implement C++11 move semantics for android::FileMap
This commit is contained in:
Adam Lesinski 2015-10-02 01:19:25 +00:00 • committed by Android Git Automerger
commit bda375fa41
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/utils/FileMap.h
View file

@ -52,6 +52,9 @@ class FileMap {
public: public:
FileMap(void); FileMap(void);
FileMap(FileMap&& f);
FileMap& operator=(FileMap&& f);
/* /*
* Create a new mapping on an open file. * Create a new mapping on an open file.
* *

37
libutils/FileMap.cpp
View file

@ -53,6 +53,43 @@ FileMap::FileMap(void)
{ {
} }
// Move Constructor.
FileMap::FileMap(FileMap&& other)
: mFileName(other.mFileName), mBasePtr(other.mBasePtr), mBaseLength(other.mBaseLength),
mDataOffset(other.mDataOffset), mDataPtr(other.mDataPtr), mDataLength(other.mDataLength)
#if defined(__MINGW32__)
, mFileHandle(other.mFileHandle), mFileMapping(other.mFileMapping)
#endif
{
other.mFileName = NULL;
other.mBasePtr = NULL;
other.mDataPtr = NULL;
#if defined(__MINGW32__)
other.mFileHandle = 0;
other.mFileMapping = 0;
#endif
}
// Move assign operator.
FileMap& FileMap::operator=(FileMap&& other) {
mFileName = other.mFileName;
mBasePtr = other.mBasePtr;
mBaseLength = other.mBaseLength;
mDataOffset = other.mDataOffset;
mDataPtr = other.mDataPtr;
mDataLength = other.mDataLength;
other.mFileName = NULL;
other.mBasePtr = NULL;
other.mDataPtr = NULL;
#if defined(__MINGW32__)
mFileHandle = other.mFileHandle;
mFileMapping = other.mFileMapping;
other.mFileHandle = 0;
other.mFileMapping = 0;
#endif
return *this;
}
// Destructor. // Destructor.
FileMap::~FileMap(void) FileMap::~FileMap(void)
{ {