diff options
| author | Juergen Gehring <juergen.gehring@bmw.de> | 2017-02-28 03:40:02 -0800 |
|---|---|---|
| committer | Juergen Gehring <juergen.gehring@bmw.de> | 2017-02-28 03:40:02 -0800 |
| commit | 66de998220d90116aa603d7458e245fe6094b4eb (patch) | |
| tree | b36d991f0ecb494b1bc94235350ba6194266d8cc /include/CommonAPI/Struct.hpp | |
| parent | 436750026fb1a27944584513c7191d1bc83e9f0d (diff) | |
| download | genivi-common-api-runtime-66de998220d90116aa603d7458e245fe6094b4eb.tar.gz | |
CommonAPI 3.1.113.1.11
Diffstat (limited to 'include/CommonAPI/Struct.hpp')
| -rw-r--r-- | include/CommonAPI/Struct.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/CommonAPI/Struct.hpp b/include/CommonAPI/Struct.hpp index 82b204c..0427426 100644 --- a/include/CommonAPI/Struct.hpp +++ b/include/CommonAPI/Struct.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -145,7 +145,7 @@ struct StructTypeWriter<EmptyDeployment, Index_, TypeOutput_, V_<Values_...>> { const V_<Values_...> &_values, const EmptyDeployment *_depl = nullptr) { StructTypeWriter<EmptyDeployment, Index_-1, TypeOutput_, V_<Values_...>>{}(_output, _values, _depl); -#ifdef WIN32 +#ifdef _WIN32 _output.writeType(std::get<Index_>(_values.values_), _depl); #else _output.template writeType(std::get<Index_>(_values.values_), _depl); @@ -159,7 +159,7 @@ struct StructTypeWriter<EmptyDeployment, 0, TypeOutput_, V_<Values_...>> { void operator()(TypeOutputStream<TypeOutput_> &_output, const V_<Values_...> &_values, const EmptyDeployment *_depl = nullptr) { -#ifdef WIN32 +#ifdef _WIN32 _output.writeType(std::get<0>(_values.values_), _depl); #else _output.template writeType(std::get<0>(_values.values_), _depl); @@ -173,7 +173,7 @@ struct StructTypeWriter<Deployment_, Index_, TypeOutput_, V_<Values_...>> { const V_<Values_...> &_values, const Deployment_ *_depl = nullptr) { StructTypeWriter<Deployment_, Index_-1, TypeOutput_, V_<Values_...>>{}(_output, _values, _depl); -#ifdef WIN32 +#ifdef _WIN32 _output.writeType(std::get<Index_>(_values.values_), (_depl ? std::get<Index_>(_depl->values_) : nullptr)); @@ -191,7 +191,7 @@ struct StructTypeWriter<Deployment_, 0, TypeOutput_, V_<Values_...>> { void operator()(TypeOutputStream<TypeOutput_> &_output, const V_<Values_...> &_values, const Deployment_ *_depl = nullptr) { -#ifdef WIN32 +#ifdef _WIN32 _output.writeType(std::get<0>(_values.values_), (_depl ? std::get<0>(_depl->values_) : nullptr)); |