MB-27661 [n/n]: Fix MSVC warnings - C4273, C2491, C4244

C4273 - function : inconsistent DLL linkage. Two definitions in a file
        differ in their use of dllimport.
C2491 - identifier : definition of dllimport function not allowed

Introduce a new file to handle the API header imports/exports
correctly on MSVC when using the same file for both libraries
and executables.

C4244 - conversion from 'type1' to 'type2', possible loss of data.
        An integer type is converted to a smaller integer type.

This is the final commit in the fix all the MSVC compiler warnings
sequence. We can now re-enable Windows build verfication compiler
warnings to report on Gerrit patches.

Change-Id: Ic1057b8d204d9b5328f2948cfffad7963e4d977c
Reviewed-on: http://review.couchbase.org/90662
Reviewed-by: Dave Rigby <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: Tim Bradgate

cbsasl/CMakeLists.txt

@@ -5,6 +5,7 @@ list(APPEND CBSASL_SOURCES
      ${Memcached_SOURCE_DIR}/cbsasl/client.cc
      ${Memcached_SOURCE_DIR}/cbsasl/common.cc
      ${Memcached_SOURCE_DIR}/cbsasl/log.cc
+     ${Memcached_SOURCE_DIR}/cbsasl/log_callback.cc
      ${Memcached_SOURCE_DIR}/cbsasl/mechanismfactory.cc
      ${Memcached_SOURCE_DIR}/cbsasl/mechanismfactory.h
      ${Memcached_SOURCE_DIR}/cbsasl/plain/check_password.cc

cbsasl/log.cc

@@ -17,7 +17,6 @@
 #include <cbsasl/cbsasl.h>
 #include "cbsasl/cbsasl_internal.h"
 
-#include <atomic>
 #include <iostream>
 #include <relaxed_atomic.h>
 
@@ -27,12 +26,6 @@ namespace logging {
 
 Couchbase::RelaxedAtomic<LogCallback> callback;
 
-using LogCallback = void (*)(Level level, const std::string& message);
-
-void set_log_callback(LogCallback logCallback) {
-    callback.store(logCallback);
-}
-
 void log(cbsasl_conn_t& connection, Level level, const std::string& message) {
     auto logger = callback.load();
     if (logger == nullptr) {

cbsasl/log_callback.cc

@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2018 Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+/*
+ *   Due to log.cc being used both in libraries and executables, the file was
+ *   not able to be compiled on Windows due to the usage of the API header
+ *   linkage. This file was created to allow for the correct API header to be
+ *   specified, and so that log.cc can be build into both libraries and
+ *   executables.
+ */
+#include <cbsasl/cbsasl.h>
+#include <relaxed_atomic.h>
+
+namespace cb {
+namespace sasl {
+namespace logging {
+
+extern Couchbase::RelaxedAtomic<LogCallback> callback;
+
+CBSASL_PUBLIC_API
+void set_log_callback(LogCallback logCallback) {
+    callback.store(logCallback);
+}
+} // namespace logging
+} // namespace sasl
+} // namespace cb

engines/ep/src/collections/collections_dockey.cc

@@ -17,6 +17,8 @@
 
 #include "collections/collections_dockey.h"
 
+#include <gsl/gsl>
+
 /**
  * Factory method to create a Collections::DocKey from a DocKey
  */
@@ -27,7 +29,7 @@ Collections::DocKey Collections::DocKey::make(const ::DocKey& key) {
     }
     const uint8_t* collection = findCollection(key, SystemSeparator);
     if (collection) {
-        return DocKey(key, collection - key.data(), 1);
+        return DocKey(key, gsl::narrow<uint8_t>(collection - key.data()), 1);
     } else {
         // No collection found, not an error - ok for DefaultNamespace.
         return DocKey(key, 0, 0);