diff options
| author | Johannes Schanda <schanda@itestra.de> | 2013-02-26 13:28:59 +0100 |
|---|---|---|
| committer | Johannes Schanda <schanda@itestra.de> | 2013-02-26 13:28:59 +0100 |
| commit | 2d63f6f48967f49e31876b0807bea66404761443 (patch) | |
| tree | f43e3dcba38f84e1a67aea55f1e939a14b83a710 /src | |
| parent | c42776d96335c0f5f380731211d47562a88e215b (diff) | |
| download | genivi-common-api-runtime-2d63f6f48967f49e31876b0807bea66404761443.tar.gz | |
Fix full namespace in variant for using namespace std compatability
Fix wrong path for byte buffers in output stream
Diffstat (limited to 'src')
| -rw-r--r-- | src/CommonAPI/OutputStream.h | 4 | ||||
| -rw-r--r-- | src/CommonAPI/SerializableVariant.hpp | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/CommonAPI/OutputStream.h b/src/CommonAPI/OutputStream.h index fccb31c..6158f12 100644 --- a/src/CommonAPI/OutputStream.h +++ b/src/CommonAPI/OutputStream.h @@ -369,10 +369,6 @@ inline OutputStream& operator<<(OutputStream& outputStream, const std::string& s return outputStream.writeValue(stringValue); } -inline OutputStream& operator<<(OutputStream& outputStream, const ByteBuffer& byteBufferValue) { - return outputStream.writeValue(byteBufferValue); -} - inline OutputStream& operator<<(OutputStream& outputStream, const Version& versionValue) { return outputStream.writeVersionValue(versionValue); } diff --git a/src/CommonAPI/SerializableVariant.hpp b/src/CommonAPI/SerializableVariant.hpp index 4ff73d2..a249f92 100644 --- a/src/CommonAPI/SerializableVariant.hpp +++ b/src/CommonAPI/SerializableVariant.hpp @@ -145,7 +145,7 @@ public: void operator()(const _Type&) { _Type value; inputStream_ >> value; - lhs_.template set<_Type>(std::move(value), false); + lhs_.Variant<_Types...>::template set<_Type>(std::move(value), false); } private: @@ -203,12 +203,12 @@ public: template<typename _Type> void operator()(const _Type& value) const { - lhs_.template set<_Type>(value, clear_); + lhs_.Variant<_Types...>::template set<_Type>(value, clear_); } template<typename _Type> void operator()(_Type& value) const { - lhs_.template set<_Type>(value, clear_); + lhs_.Variant<_Types...>::template set<_Type>(value, clear_); } private: |