summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schanda <schanda@itestra.de>2013-01-23 15:26:34 +0100
committerJohannes Schanda <schanda@itestra.de>2013-01-23 15:26:34 +0100
commit36464594056682403c7c522cf16e36f536e46ff1 (patch)
tree12c23c01ad3e3a6794cfef1dd2a4083aaab32d35
parent1b54b59370098bd64ab3bee07d0e4e584138d340 (diff)
downloadgenivi-common-api-runtime-36464594056682403c7c522cf16e36f536e46ff1.tar.gz
Really fix compile problems on older GCC
-rw-r--r--src/CommonAPI/SerializableVariant.h2
-rw-r--r--src/CommonAPI/SerializableVariant.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/CommonAPI/SerializableVariant.h b/src/CommonAPI/SerializableVariant.h
index 29cf6b2..b7524ed 100644
--- a/src/CommonAPI/SerializableVariant.h
+++ b/src/CommonAPI/SerializableVariant.h
@@ -114,7 +114,7 @@ public:
typename std::enable_if<!std::is_same<_Type, Variant>::value>::type* = 0);
template <typename _Type>
- const typename VariantTypeSelector<_Type, _Types...>::type& get() const;
+ const _Type& get() const;
inline uint8_t getValueType() const {
return valueType_;
diff --git a/src/CommonAPI/SerializableVariant.hpp b/src/CommonAPI/SerializableVariant.hpp
index 7d9d34b..4ff73d2 100644
--- a/src/CommonAPI/SerializableVariant.hpp
+++ b/src/CommonAPI/SerializableVariant.hpp
@@ -408,7 +408,7 @@ typename std::enable_if<!std::is_same<_Type, Variant<_Types...>>::value>::type*)
template<typename ... _Types>
template<typename _Type>
-const typename VariantTypeSelector<_Type, _Types...>::type & Variant<_Types...>::get() const {
+const _Type & Variant<_Types...>::get() const {
typedef typename TypeSelector<_Type, _Types...>::type selected_type_t;
uint8_t cType = TypeIndex<_Types...>::template get<selected_type_t>();
if (cType == valueType_) {