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/Serializable.cpp | |
| 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/Serializable.cpp')
| -rw-r--r-- | src/Platform/Serializable.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/Platform/Serializable.cpp b/src/Platform/Serializable.cpp index 0ffb2771..a9151c0d 100644 --- a/src/Platform/Serializable.cpp +++ b/src/Platform/Serializable.cpp @@ -3,41 +3,41 @@ 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. -*/
-
-#include "Serializable.h"
-#include "SerializerFactory.h"
-
-namespace VeraCrypt
-{
- string Serializable::DeserializeHeader (shared_ptr <Stream> stream)
- {
- Serializer sr (stream);
- return sr.DeserializeString ("SerializableName");
- }
-
- Serializable *Serializable::DeserializeNew (shared_ptr <Stream> stream)
- {
- string name = Serializable::DeserializeHeader (stream);
- Serializable *serializable = SerializerFactory::GetNewSerializable (name);
- serializable->Deserialize (stream);
-
- return serializable;
- }
-
- void Serializable::Serialize (shared_ptr <Stream> stream) const
- {
- Serializer sr (stream);
- Serializable::SerializeHeader (sr, SerializerFactory::GetName (typeid (*this)));
- }
-
- void Serializable::SerializeHeader (Serializer &serializer, const string &name)
- {
- serializer.Serialize ("SerializableName", name);
- }
-}
+*/ + +#include "Serializable.h" +#include "SerializerFactory.h" + +namespace VeraCrypt +{ + string Serializable::DeserializeHeader (shared_ptr <Stream> stream) + { + Serializer sr (stream); + return sr.DeserializeString ("SerializableName"); + } + + Serializable *Serializable::DeserializeNew (shared_ptr <Stream> stream) + { + string name = Serializable::DeserializeHeader (stream); + Serializable *serializable = SerializerFactory::GetNewSerializable (name); + serializable->Deserialize (stream); + + return serializable; + } + + void Serializable::Serialize (shared_ptr <Stream> stream) const + { + Serializer sr (stream); + Serializable::SerializeHeader (sr, SerializerFactory::GetName (typeid (*this))); + } + + void Serializable::SerializeHeader (Serializer &serializer, const string &name) + { + serializer.Serialize ("SerializableName", name); + } +} |