From fc37cc4a02ed13d1a73b941a9f80975600fd1b99 Mon Sep 17 00:00:00 2001
From: David Foerster <david.foerster@informatik.hu-berlin.de>
Date: Tue, 10 May 2016 20:20:14 +0200
Subject: Normalize all line terminators

---
 src/Platform/Serializer.h | 136 +++++++++++++++++++++++-----------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

(limited to 'src/Platform/Serializer.h')

diff --git a/src/Platform/Serializer.h b/src/Platform/Serializer.h
index 67760c45..50065b9a 100644
--- a/src/Platform/Serializer.h
+++ b/src/Platform/Serializer.h
@@ -8,71 +8,71 @@
  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_Serializer
-#define TC_HEADER_Platform_Serializer
-
-#include "PlatformBase.h"
-#include "Buffer.h"
-#include "SharedPtr.h"
-#include "Stream.h"
-
-namespace VeraCrypt
-{
-	class Serializer
-	{
-	public:
-		Serializer (shared_ptr <Stream> stream) : DataStream (stream) { }
-		virtual ~Serializer () { }
-
-		void Deserialize (const string &name, bool &data);
-		void Deserialize (const string &name, byte &data);
-		void Deserialize (const string &name, int32 &data);
-		void Deserialize (const string &name, int64 &data);
-		void Deserialize (const string &name, uint32 &data);
-		void Deserialize (const string &name, uint64 &data);
-		void Deserialize (const string &name, string &data);
-		void Deserialize (const string &name, wstring &data);
-		void Deserialize (const string &name, const BufferPtr &data);
-		bool DeserializeBool (const string &name);
-		int32 DeserializeInt32 (const string &name);
-		int64 DeserializeInt64 (const string &name);
-		uint32 DeserializeUInt32 (const string &name);
-		uint64 DeserializeUInt64 (const string &name);
-		string DeserializeString (const string &name);
-		list <string> DeserializeStringList (const string &name);
-		wstring DeserializeWString (const string &name);
-		list <wstring> DeserializeWStringList (const string &name);
-		void Serialize (const string &name, bool data);
-		void Serialize (const string &name, byte data);
-		void Serialize (const string &name, const char *data);
-		void Serialize (const string &name, int32 data);
-		void Serialize (const string &name, int64 data);
-		void Serialize (const string &name, uint32 data);
-		void Serialize (const string &name, uint64 data);
-		void Serialize (const string &name, const string &data);
-		void Serialize (const string &name, const wstring &data);
-		void Serialize (const string &name, const wchar_t *data);
-		void Serialize (const string &name, const list <string> &stringList);
-		void Serialize (const string &name, const list <wstring> &stringList);
-		void Serialize (const string &name, const ConstBufferPtr &data);
-
-	protected:
-		template <typename T> T Deserialize ();
-		string DeserializeString ();
-		wstring DeserializeWString ();
-		template <typename T> void Serialize (T data);
-		void SerializeString (const string &data);
-		void SerializeWString (const wstring &data);
-		void ValidateName (const string &name);
-
-		shared_ptr <Stream> DataStream;
-
-	private:
-		Serializer (const Serializer &);
-		Serializer &operator= (const Serializer &);
-	};
-}
-
-#endif // TC_HEADER_Platform_Serializer
+*/
+
+#ifndef TC_HEADER_Platform_Serializer
+#define TC_HEADER_Platform_Serializer
+
+#include "PlatformBase.h"
+#include "Buffer.h"
+#include "SharedPtr.h"
+#include "Stream.h"
+
+namespace VeraCrypt
+{
+	class Serializer
+	{
+	public:
+		Serializer (shared_ptr <Stream> stream) : DataStream (stream) { }
+		virtual ~Serializer () { }
+
+		void Deserialize (const string &name, bool &data);
+		void Deserialize (const string &name, byte &data);
+		void Deserialize (const string &name, int32 &data);
+		void Deserialize (const string &name, int64 &data);
+		void Deserialize (const string &name, uint32 &data);
+		void Deserialize (const string &name, uint64 &data);
+		void Deserialize (const string &name, string &data);
+		void Deserialize (const string &name, wstring &data);
+		void Deserialize (const string &name, const BufferPtr &data);
+		bool DeserializeBool (const string &name);
+		int32 DeserializeInt32 (const string &name);
+		int64 DeserializeInt64 (const string &name);
+		uint32 DeserializeUInt32 (const string &name);
+		uint64 DeserializeUInt64 (const string &name);
+		string DeserializeString (const string &name);
+		list <string> DeserializeStringList (const string &name);
+		wstring DeserializeWString (const string &name);
+		list <wstring> DeserializeWStringList (const string &name);
+		void Serialize (const string &name, bool data);
+		void Serialize (const string &name, byte data);
+		void Serialize (const string &name, const char *data);
+		void Serialize (const string &name, int32 data);
+		void Serialize (const string &name, int64 data);
+		void Serialize (const string &name, uint32 data);
+		void Serialize (const string &name, uint64 data);
+		void Serialize (const string &name, const string &data);
+		void Serialize (const string &name, const wstring &data);
+		void Serialize (const string &name, const wchar_t *data);
+		void Serialize (const string &name, const list <string> &stringList);
+		void Serialize (const string &name, const list <wstring> &stringList);
+		void Serialize (const string &name, const ConstBufferPtr &data);
+
+	protected:
+		template <typename T> T Deserialize ();
+		string DeserializeString ();
+		wstring DeserializeWString ();
+		template <typename T> void Serialize (T data);
+		void SerializeString (const string &data);
+		void SerializeWString (const wstring &data);
+		void ValidateName (const string &name);
+
+		shared_ptr <Stream> DataStream;
+
+	private:
+		Serializer (const Serializer &);
+		Serializer &operator= (const Serializer &);
+	};
+}
+
+#endif // TC_HEADER_Platform_Serializer
-- 
cgit v1.2.3