From 30d966ca3653e90c507514a37d81f108201b4095 Mon Sep 17 00:00:00 2001
From: lucapegolotti <luca.pegolotti@epfl.ch>
Date: Tue, 29 Mar 2016 10:13:18 +0200
Subject: [PATCH] Suppressed warning 4548 in containers_cpp's main.cc

---
 containers_cpp/test/main.cc | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/containers_cpp/test/main.cc b/containers_cpp/test/main.cc
index d21dede..7edeb87 100644
--- a/containers_cpp/test/main.cc
+++ b/containers_cpp/test/main.cc
@@ -24,14 +24,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <embb/containers/lock_free_tree_value_pool.h>
-#include <embb/containers/wait_free_array_value_pool.h>
-#include <embb/containers/wait_free_spsc_queue.h>
-#include <embb/containers/object_pool.h>
-#include <embb/containers/lock_free_stack.h>
-#include <embb/containers/lock_free_mpmc_queue.h>
 #include <embb/base/c/memory_allocation.h>
 
+
 #include <partest/partest.h>
 #include <embb/base/thread.h>
 
@@ -41,6 +36,28 @@
 #include "./hazard_pointer_test.h"
 #include "./object_pool_test.h"
 
+
+
+#ifdef EMBB_PLATFORM_COMPILER_MSVC
+ // Suppress warning generated by malloc.h(160): expression before comma
+ // has no effect: expected expression with side effect
+#pragma warning(push)
+#pragma warning(disable : 4548)
+#endif
+
+#include <embb/containers/lock_free_tree_value_pool.h>
+#include <embb/containers/wait_free_array_value_pool.h>
+#include <embb/containers/wait_free_spsc_queue.h>
+#include <embb/containers/object_pool.h>
+#include <embb/containers/lock_free_stack.h>
+#include <embb/containers/lock_free_mpmc_queue.h>
+
+#ifdef EMBB_PLATFORM_COMPILER_MSVC
+#pragma warning(pop) // Reset warning 4548
+#endif
+
+
+
 #define COMMA ,
 
 using embb::containers::WaitFreeArrayValuePool;
@@ -57,6 +74,8 @@ using embb::containers::test::StackTest;
 using embb::containers::test::ObjectPoolTest;
 using embb::containers::test::HazardPointerTest2;
 
+
+
 PT_MAIN("Data Structures C++") {
   unsigned int max_threads = static_cast<unsigned int>(
     2 * partest::TestSuite::GetDefaultNumThreads());
@@ -75,3 +94,7 @@ PT_MAIN("Data Structures C++") {
 
   PT_EXPECT(embb_get_bytes_allocated() == 0);
 }
+
+
+
+
--
libgit2 0.26.0