am bda375fa: am c6c6ab50: Merge "Implement C++11 move semantics for android::FileMap" (0b2bce06) · Commits · e / os / android_system_core

include/utils/FileMap.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,9 @@ class FileMap {
		public:
		FileMap(void);

		FileMap(FileMap&& f);
		FileMap& operator=(FileMap&& f);

		/*
		* Create a new mapping on an open file.
		*

+37 −0

Original line number	Diff line number	Diff line
		@@ -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.
		FileMap::~FileMap(void)
		{