Eliminate all Windows (VS 2017) build warnings

totalgee · totalgee · commit 409786bd51a5 · 2018-08-28T11:50:38.000+02:00
- use %zu format rather than %lu for printf with size_t types.
- explicitly throw away "nodiscard" return value of std::adjacent_find().
- explicitly cast to unsigned type when creating a Taskflow.
- (git) ignore Windows/MSVC files and directories.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,10 @@ build/
 example/simple 
 *.swp
 *.sh
+
+# Windows/MSVC
+.vs/
+*.exe
+*.pdb
+*.ilk
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,7 +38,13 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 #set(USE_WERROR ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+  # The warning and optimization flags are already set correctly for the
+  # configuration; don't override them here
+  # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /O2")
+else()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
+endif()
 message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE})
 message(STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER})
 message(STATUS "CMAKE_CXX_COMPILER_VERSION: " ${CMAKE_CXX_COMPILER_VERSION})
diff --git a/example/matrix.cpp b/example/matrix.cpp
@@ -49,7 +49,7 @@ matrix_t operator * (const matrix_t& A, const matrix_t& B) {
   K = A[0].size();
   M = B[0].size();
 
-  printf("A[%lux%lu] * B[%lux%lu]\n", N, K, K, M);
+  printf("A[%zux%zu] * B[%zux%zu]\n", N, K, K, M);
   
   // Initialize the matrix
   matrix_t ret(N);
diff --git a/taskflow/taskflow.hpp b/taskflow/taskflow.hpp
@@ -982,7 +982,7 @@ auto BasicFlowBuilder<NodeType>::transform_reduce(
 template <typename NodeType>
 template <typename L>
 void BasicFlowBuilder<NodeType>::_linearize(L& keys) {
-  std::adjacent_find(
+  (void) std::adjacent_find(
     keys.begin(), keys.end(), 
     [] (auto& from, auto& to) {
       from._node->precede(*(to._node));
diff --git a/unittest/taskflow.cpp b/unittest/taskflow.cpp
@@ -16,7 +16,7 @@ TEST_CASE("Taskflow.Builder" * doctest::timeout(5)){
   size_t num_workers = 4;
   size_t num_tasks = 100;
 
-  tf::Taskflow tf(num_workers);
+  tf::Taskflow tf(static_cast<unsigned>(num_workers));
   REQUIRE(tf.num_workers() == num_workers);
 
   std::atomic<int> counter {0};
@@ -184,7 +184,7 @@ TEST_CASE("Taskflow.Dispatch" * doctest::timeout(5)) {
   size_t num_workers = 4;
   size_t num_tasks = 100;
   
-  tf::Taskflow tf(num_workers);
+  tf::Taskflow tf(static_cast<unsigned>(num_workers));
   REQUIRE(tf.num_workers() == num_workers);
 
   std::atomic<int> counter {0};
@@ -224,7 +224,7 @@ TEST_CASE("Taskflow.ParallelFor" * doctest::timeout(5)) {
   using namespace std::chrono_literals;
 
   const auto mapper = [](size_t num_workers, size_t num_data, bool group){
-    tf::Taskflow tf(num_workers);
+    tf::Taskflow tf(static_cast<unsigned>(num_workers));
     std::vector<int> vec(num_data, 0);
     tf.parallel_for(vec, [] (int& v) { v = 64; }, group ? ::rand() : 0);
     for(const auto v : vec) {
@@ -237,7 +237,7 @@ TEST_CASE("Taskflow.ParallelFor" * doctest::timeout(5)) {
   };
 
   const auto reducer = [](size_t num_workers, size_t num_data, bool group){
-    tf::Taskflow tf(num_workers);
+    tf::Taskflow tf(static_cast<unsigned>(num_workers));
     std::vector<int> vec(num_data, 0);
     std::atomic<int> sum(0);
     tf.parallel_for(vec, [&](auto) { ++sum; }, group ? ::rand() : 0);
@@ -273,7 +273,7 @@ TEST_CASE("Taskflow.ParallelFor" * doctest::timeout(5)) {
 TEST_CASE("Taskflow.Reduce" * doctest::timeout(5)) {
 
   const auto plus_test = [](const size_t num_workers, auto &&data){
-    tf::Taskflow tf(num_workers);
+    tf::Taskflow tf(static_cast<unsigned>(num_workers));
     int result {0};
     std::iota(data.begin(), data.end(), 1);
     tf.reduce(data.begin(), data.end(), result, std::plus<int>());
@@ -282,7 +282,7 @@ TEST_CASE("Taskflow.Reduce" * doctest::timeout(5)) {
   };
 
   const auto multiply_test = [](const size_t num_workers, auto &&data){
-    tf::Taskflow tf(num_workers);
+    tf::Taskflow tf(static_cast<unsigned>(num_workers));
     std::fill(data.begin(), data.end(), 1.0);
     double result {2.0};
     tf.reduce(data.begin(), data.end(), result, std::multiplies<double>());
@@ -291,7 +291,7 @@ TEST_CASE("Taskflow.Reduce" * doctest::timeout(5)) {
   };
 
   const auto max_test = [](const size_t num_workers, auto &&data){
-    tf::Taskflow tf(num_workers);
+    tf::Taskflow tf(static_cast<unsigned>(num_workers));
     std::iota(data.begin(), data.end(), 1);
     int result {0};
     auto lambda = [](const auto& l, const auto& r){return std::max(l, r);};
@@ -301,7 +301,7 @@ TEST_CASE("Taskflow.Reduce" * doctest::timeout(5)) {
   };
 
   const auto min_test = [](const size_t num_workers, auto &&data){
-    tf::Taskflow tf(num_workers);
+    tf::Taskflow tf(static_cast<unsigned>(num_workers));
     std::iota(data.begin(), data.end(), 1);
     int result {std::numeric_limits<int>::max()};
     auto lambda = [](const auto& l, const auto& r){return std::min(l, r);};
