diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
commit | 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch) | |
tree | b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Platform/MemoryStream.h | |
parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Platform/MemoryStream.h')
-rw-r--r-- | src/Platform/MemoryStream.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/Platform/MemoryStream.h b/src/Platform/MemoryStream.h index 5591286a..0c38f4d2 100644 --- a/src/Platform/MemoryStream.h +++ b/src/Platform/MemoryStream.h @@ -3,38 +3,38 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source code distribution packages. -*/
-
-#ifndef TC_HEADER_Platform_MemoryStream
-#define TC_HEADER_Platform_MemoryStream
-
-#include "PlatformBase.h"
-#include "Stream.h"
-
-namespace VeraCrypt
-{
- class MemoryStream : public Stream
- {
- public:
- MemoryStream () : ReadPosition (0) { }
- MemoryStream (const ConstBufferPtr &data);
- virtual ~MemoryStream () { }
-
- operator ConstBufferPtr () const { return ConstBufferPtr (&Data[0], Data.size()); }
-
- virtual uint64 Read (const BufferPtr &buffer);
- virtual void ReadCompleteBuffer (const BufferPtr &buffer);
- virtual void Write (const ConstBufferPtr &data);
-
- protected:
- vector <byte> Data;
- size_t ReadPosition;
- };
-}
-
-#endif // TC_HEADER_Platform_MemoryStream
+*/ + +#ifndef TC_HEADER_Platform_MemoryStream +#define TC_HEADER_Platform_MemoryStream + +#include "PlatformBase.h" +#include "Stream.h" + +namespace VeraCrypt +{ + class MemoryStream : public Stream + { + public: + MemoryStream () : ReadPosition (0) { } + MemoryStream (const ConstBufferPtr &data); + virtual ~MemoryStream () { } + + operator ConstBufferPtr () const { return ConstBufferPtr (&Data[0], Data.size()); } + + virtual uint64 Read (const BufferPtr &buffer); + virtual void ReadCompleteBuffer (const BufferPtr &buffer); + virtual void Write (const ConstBufferPtr &data); + + protected: + vector <byte> Data; + size_t ReadPosition; + }; +} + +#endif // TC_HEADER_Platform_MemoryStream |