CommonAPI 3.1.113.1.11

10 files changed, 19 insertions, 19 deletions

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/.