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 | |
| parent | 436750026fb1a27944584513c7191d1bc83e9f0d (diff) | |
| download | genivi-common-api-runtime-66de998220d90116aa603d7458e245fe6094b4eb.tar.gz | |
CommonAPI 3.1.113.1.11
46 files changed, 73 insertions, 67 deletions
@@ -1,6 +1,11 @@ Changes ======= +v3.1.11 +- console logging - log to standard error stream instead of standard output stream +- Runtime::initFactories() made public +- check for #define _WIN32 instead of (deprecated) WIN32 + v3.1.10.1 - Fixed crash on dlclose() diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c78c9d..5749fef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +# Copyright (C) 2013-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/. @@ -10,7 +10,7 @@ PROJECT(libcommonapi) # version of CommonAPI SET( LIBCOMMONAPI_MAJOR_VERSION 3 ) SET( LIBCOMMONAPI_MINOR_VERSION 1 ) -SET( LIBCOMMONAPI_PATCH_VERSION 10 ) +SET( LIBCOMMONAPI_PATCH_VERSION 11 ) message(STATUS "Project name: ${PROJECT_NAME}") @@ -1,8 +1,8 @@ ### CommonAPI C++ Core Runtime ##### Copyright -Copyright (C) 2016, Bayerische Motoren Werke Aktiengesellschaft (BMW AG). -Copyright (C) 2016, GENIVI Alliance, Inc. +Copyright (C) 2016-2017, Bayerische Motoren Werke Aktiengesellschaft (BMW AG). +Copyright (C) 2016-2017, GENIVI Alliance, Inc. This file is part of GENIVI Project IPC Common API C++. Contributions are licensed to the GENIVI Alliance under one or more Contribution License Agreements or MPL 2.0. diff --git a/include/CommonAPI/Address.hpp b/include/CommonAPI/Address.hpp index 39cac8b..bf21f65 100644 --- a/include/CommonAPI/Address.hpp +++ b/include/CommonAPI/Address.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/include/CommonAPI/Attribute.hpp b/include/CommonAPI/Attribute.hpp index 5d7a531..16ed47e 100644 --- a/include/CommonAPI/Attribute.hpp +++ b/include/CommonAPI/Attribute.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. @@ -132,7 +132,7 @@ template <typename ValueType_> struct ObservableAttribute: ObservableAttributeImpl< Attribute<ValueType_> > { }; -#ifdef WIN32 +#ifdef _WIN32 struct WINDummyAttribute { WINDummyAttribute() {} }; diff --git a/include/CommonAPI/AttributeExtension.hpp b/include/CommonAPI/AttributeExtension.hpp index b878eb1..569be18 100644 --- a/include/CommonAPI/AttributeExtension.hpp +++ b/include/CommonAPI/AttributeExtension.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/ByteBuffer.hpp b/include/CommonAPI/ByteBuffer.hpp index 5d3ad39..b8f72a5 100644 --- a/include/CommonAPI/ByteBuffer.hpp +++ b/include/CommonAPI/ByteBuffer.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/CallInfo.hpp b/include/CommonAPI/CallInfo.hpp index 53a43e9..2132f7c 100644 --- a/include/CommonAPI/CallInfo.hpp +++ b/include/CommonAPI/CallInfo.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/include/CommonAPI/CommonAPI.hpp b/include/CommonAPI/CommonAPI.hpp index 81748d1..a609350 100644 --- a/include/CommonAPI/CommonAPI.hpp +++ b/include/CommonAPI/CommonAPI.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/Config.hpp b/include/CommonAPI/Config.hpp index e4450d5..aff41d3 100644 --- a/include/CommonAPI/Config.hpp +++ b/include/CommonAPI/Config.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/include/CommonAPI/ContainerUtils.hpp b/include/CommonAPI/ContainerUtils.hpp index 9fddc08..c436ae9 100644 --- a/include/CommonAPI/ContainerUtils.hpp +++ b/include/CommonAPI/ContainerUtils.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/Deployable.hpp b/include/CommonAPI/Deployable.hpp index 4b4b901..c260586 100644 --- a/include/CommonAPI/Deployable.hpp +++ b/include/CommonAPI/Deployable.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/. diff --git a/include/CommonAPI/Deployment.hpp b/include/CommonAPI/Deployment.hpp index 98a99a9..e398cdd 100644 --- a/include/CommonAPI/Deployment.hpp +++ b/include/CommonAPI/Deployment.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/. diff --git a/include/CommonAPI/Enumeration.hpp b/include/CommonAPI/Enumeration.hpp index 2f241e7..7d6ef28 100644 --- a/include/CommonAPI/Enumeration.hpp +++ b/include/CommonAPI/Enumeration.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/include/CommonAPI/Event.hpp b/include/CommonAPI/Event.hpp index 470146f..5fbec00 100644 --- a/include/CommonAPI/Event.hpp +++ b/include/CommonAPI/Event.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/Export.hpp b/include/CommonAPI/Export.hpp index b95693b..c7965f8 100644 --- a/include/CommonAPI/Export.hpp +++ b/include/CommonAPI/Export.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. @@ -6,7 +6,7 @@ #ifndef COMMONAPI_EXPORT_HPP_ #define COMMONAPI_EXPORT_HPP_ -#ifdef WIN32 +#ifdef _WIN32 #define COMMONAPI_EXPORT __declspec(dllexport) #define COMMONAPI_EXPORT_CLASS_EXPLICIT diff --git a/include/CommonAPI/Extensions/AttributeCacheExtension.hpp b/include/CommonAPI/Extensions/AttributeCacheExtension.hpp index 7a8e8d5..051bb09 100644 --- a/include/CommonAPI/Extensions/AttributeCacheExtension.hpp +++ b/include/CommonAPI/Extensions/AttributeCacheExtension.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/include/CommonAPI/Factory.hpp b/include/CommonAPI/Factory.hpp index b0ecdb3..b71b26f 100644 --- a/include/CommonAPI/Factory.hpp +++ b/include/CommonAPI/Factory.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/IniFileReader.hpp b/include/CommonAPI/IniFileReader.hpp index a04e5b3..6fea715 100644 --- a/include/CommonAPI/IniFileReader.hpp +++ b/include/CommonAPI/IniFileReader.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/include/CommonAPI/InputStream.hpp b/include/CommonAPI/InputStream.hpp index 5e8da99..0380a59 100644 --- a/include/CommonAPI/InputStream.hpp +++ b/include/CommonAPI/InputStream.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/Logger.hpp b/include/CommonAPI/Logger.hpp index d1b86fa..bb8c482 100644 --- a/include/CommonAPI/Logger.hpp +++ b/include/CommonAPI/Logger.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/include/CommonAPI/LoggerImpl.hpp b/include/CommonAPI/LoggerImpl.hpp index 1491e1b..1c69d87 100644 --- a/include/CommonAPI/LoggerImpl.hpp +++ b/include/CommonAPI/LoggerImpl.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/include/CommonAPI/MainLoopContext.hpp b/include/CommonAPI/MainLoopContext.hpp index e46e99f..f50e5b1 100644 --- a/include/CommonAPI/MainLoopContext.hpp +++ b/include/CommonAPI/MainLoopContext.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. @@ -12,13 +12,13 @@ #include <cstdint> -#ifdef WIN32 +#ifdef _WIN32 #include <WinSock2.h> #else #include <poll.h> #endif -#ifdef WIN32 +#ifdef _WIN32 #undef max #endif @@ -111,7 +111,7 @@ struct Watch { */ virtual const pollfd& getAssociatedFileDescriptor() = 0; -#ifdef WIN32 +#ifdef _WIN32 /** * \brief Returns the event bound to the file descriptor that is managed by this watch. * diff --git a/include/CommonAPI/OutputStream.hpp b/include/CommonAPI/OutputStream.hpp index df12297..3a453b6 100644 --- a/include/CommonAPI/OutputStream.hpp +++ b/include/CommonAPI/OutputStream.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/Proxy.hpp b/include/CommonAPI/Proxy.hpp index 993348b..015658f 100644 --- a/include/CommonAPI/Proxy.hpp +++ b/include/CommonAPI/Proxy.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/ProxyManager.hpp b/include/CommonAPI/ProxyManager.hpp index c68e844..42b4787 100644 --- a/include/CommonAPI/ProxyManager.hpp +++ b/include/CommonAPI/ProxyManager.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/Runtime.hpp b/include/CommonAPI/Runtime.hpp index 626bf4e..169e039 100644 --- a/include/CommonAPI/Runtime.hpp +++ b/include/CommonAPI/Runtime.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. @@ -137,8 +137,9 @@ public: inline const std::string &getDefaultBinding() const { return defaultBinding_; }; -private: COMMONAPI_EXPORT void initFactories(); + +private: COMMONAPI_EXPORT bool readConfiguration(); COMMONAPI_EXPORT bool splitAddress(const std::string &, std::string &, std::string &, std::string &); diff --git a/include/CommonAPI/SelectiveEvent.hpp b/include/CommonAPI/SelectiveEvent.hpp index 2eef184..6c7a6d8 100644 --- a/include/CommonAPI/SelectiveEvent.hpp +++ b/include/CommonAPI/SelectiveEvent.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/SerializableArguments.hpp b/include/CommonAPI/SerializableArguments.hpp index c19633a..65f7ca1 100644 --- a/include/CommonAPI/SerializableArguments.hpp +++ b/include/CommonAPI/SerializableArguments.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/. 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)); diff --git a/include/CommonAPI/Stub.hpp b/include/CommonAPI/Stub.hpp index 61db6bd..9e4f4f8 100644 --- a/include/CommonAPI/Stub.hpp +++ b/include/CommonAPI/Stub.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/. diff --git a/include/CommonAPI/TypeOutputStream.hpp b/include/CommonAPI/TypeOutputStream.hpp index 1728253..a170727 100644 --- a/include/CommonAPI/TypeOutputStream.hpp +++ b/include/CommonAPI/TypeOutputStream.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/. diff --git a/include/CommonAPI/Types.hpp b/include/CommonAPI/Types.hpp index 4cdff5d..2059def 100644 --- a/include/CommonAPI/Types.hpp +++ b/include/CommonAPI/Types.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. @@ -46,7 +46,7 @@ namespace CommonAPI { #endif -#ifdef WIN32 +#ifdef _WIN32 #define CCALL __cdecl #pragma section(".CRT$XCU",read) #define INITIALIZER(f) \ diff --git a/include/CommonAPI/Utils.hpp b/include/CommonAPI/Utils.hpp index 94891d5..2dc926f 100644 --- a/include/CommonAPI/Utils.hpp +++ b/include/CommonAPI/Utils.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/. diff --git a/include/CommonAPI/Variant.hpp b/include/CommonAPI/Variant.hpp index b139704..8ae9e6c 100644 --- a/include/CommonAPI/Variant.hpp +++ b/include/CommonAPI/Variant.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/include/CommonAPI/Version.hpp b/include/CommonAPI/Version.hpp index 997006a..0a23b88 100644 --- a/include/CommonAPI/Version.hpp +++ b/include/CommonAPI/Version.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/. diff --git a/src/CommonAPI/Address.cpp b/src/CommonAPI/Address.cpp index 2bc100d..280c0be 100644 --- a/src/CommonAPI/Address.cpp +++ b/src/CommonAPI/Address.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/src/CommonAPI/ContainerUtils.cpp b/src/CommonAPI/ContainerUtils.cpp index 887ac91..71876bd 100644 --- a/src/CommonAPI/ContainerUtils.cpp +++ b/src/CommonAPI/ContainerUtils.cpp @@ -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/. diff --git a/src/CommonAPI/IniFileReader.cpp b/src/CommonAPI/IniFileReader.cpp index fd8adf8..c91e91f 100644 --- a/src/CommonAPI/IniFileReader.cpp +++ b/src/CommonAPI/IniFileReader.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/src/CommonAPI/Logger.cpp b/src/CommonAPI/Logger.cpp index c3f9213..8d5c18f 100644 --- a/src/CommonAPI/Logger.cpp +++ b/src/CommonAPI/Logger.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. diff --git a/src/CommonAPI/LoggerImpl.cpp b/src/CommonAPI/LoggerImpl.cpp index fc119d3..28143bf 100644 --- a/src/CommonAPI/LoggerImpl.cpp +++ b/src/CommonAPI/LoggerImpl.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2015-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/. @@ -98,7 +98,7 @@ LoggerImpl::doLog(Level _level, const std::string &_message) { #ifdef USE_CONSOLE if (useConsole_) { std::lock_guard<std::mutex> itsLock(mutex_); - std::cout << "[CAPI][" << levelAsString(_level) << "] " << _message << std::endl; + std::cerr << "[CAPI][" << levelAsString(_level) << "] " << _message << std::endl; } #endif #ifdef USE_FILE diff --git a/src/CommonAPI/MainLoopContext.cpp b/src/CommonAPI/MainLoopContext.cpp index 65346a6..0dfa1bd 100644 --- a/src/CommonAPI/MainLoopContext.cpp +++ b/src/CommonAPI/MainLoopContext.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/src/CommonAPI/Proxy.cpp b/src/CommonAPI/Proxy.cpp index 8f672d2..f611059 100644 --- a/src/CommonAPI/Proxy.cpp +++ b/src/CommonAPI/Proxy.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/src/CommonAPI/ProxyManager.cpp b/src/CommonAPI/ProxyManager.cpp index d369fbb..e5183b0 100644 --- a/src/CommonAPI/ProxyManager.cpp +++ b/src/CommonAPI/ProxyManager.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. diff --git a/src/CommonAPI/Runtime.cpp b/src/CommonAPI/Runtime.cpp index 6ba6864..221264c 100644 --- a/src/CommonAPI/Runtime.cpp +++ b/src/CommonAPI/Runtime.cpp @@ -1,9 +1,9 @@ -// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2013-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/. -#ifdef WIN32 +#ifdef _WIN32 #include <Windows.h> #else #include <dlfcn.h> @@ -61,7 +61,7 @@ Runtime::~Runtime() { bool Runtime::registerFactory(const std::string &_binding, std::shared_ptr<Factory> _factory) { bool isRegistered(false); -#ifndef WIN32 +#ifndef _WIN32 std::lock_guard<std::mutex> itsLock(factoriesMutex_); #endif if (_binding == defaultBinding_) { @@ -83,7 +83,7 @@ Runtime::registerFactory(const std::string &_binding, std::shared_ptr<Factory> _ bool Runtime::unregisterFactory(const std::string &_binding) { -#ifndef WIN32 +#ifndef _WIN32 std::lock_guard<std::mutex> itsLock(factoriesMutex_); #endif if (_binding == defaultBinding_) { @@ -98,7 +98,7 @@ Runtime::unregisterFactory(const std::string &_binding) { * Private */ void Runtime::init() { -#ifndef WIN32 +#ifndef _WIN32 std::lock_guard<std::mutex> itsLock(mutex_); #endif if (!isConfigured_) { @@ -151,7 +151,7 @@ Runtime::readConfiguration() { #define MAX_PATH_LEN 255 std::string config; char currentDirectory[MAX_PATH_LEN]; -#ifdef WIN32 +#ifdef _WIN32 if (GetCurrentDirectory(MAX_PATH_LEN, currentDirectory)) { #else if (getcwd(currentDirectory, MAX_PATH_LEN)) { @@ -332,7 +332,7 @@ Runtime::getLibrary( // name. library = getProperty("LibraryBase"); if (library != "") { -#ifdef WIN32 +#ifdef _WIN32 library = library + "-" + defaultBinding_; #else library = "lib" + library + "-" + defaultBinding_; @@ -350,7 +350,7 @@ Runtime::loadLibrary(const std::string &_library) { std::string itsLibrary(_library); // TODO: decide whether this really is a good idea... - #ifdef WIN32 + #ifdef _WIN32 if (itsLibrary.rfind(".dll") != itsLibrary.length() - 4) { itsLibrary += ".dll"; } @@ -382,7 +382,7 @@ Runtime::loadLibrary(const std::string &_library) { bool isLoaded(true); if (loadedLibraries_.end() == loadedLibraries_.find(itsLibrary)) { - #ifdef WIN32 + #ifdef _WIN32 if (LoadLibrary(itsLibrary.c_str()) != 0) { loadedLibraries_.insert(itsLibrary); COMMONAPI_DEBUG("Loading interface library \"", itsLibrary, "\" succeeded."); diff --git a/src/CommonAPI/Utils.cpp b/src/CommonAPI/Utils.cpp index 31d9986..a2058c0 100644 --- a/src/CommonAPI/Utils.cpp +++ b/src/CommonAPI/Utils.cpp @@ -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/. |