Merge branch 'development' into embb_523_rework_hazard_pointer

README.md

@@ -270,8 +270,8 @@ If you want to use the C++ functionalities of EMB², you have to link the
 following libraries (names will be different on Windows and on Linux) in the
 following libraries (names will be different on Windows and on Linux) in the
 given order:
 given order:
 
 
-    embb_base, embb_base_cpp, embb_mtapi_c, embb_mtapi_cpp, embb_containers_cpp,
-    embb_algorithms_cpp, embb_dataflow_cpp
+    embb_dataflow_cpp, embb_algorithms_cpp, embb_containers_cpp,
+    embb_mtapi_cpp, embb_mtapi_c, embb_base_cpp, embb_base_c
 
 
 The C++ header files can be included as follows:
 The C++ header files can be included as follows:
 
 
@@ -284,7 +284,7 @@ The C++ header files can be included as follows:
 
 
 The following libraries have to be linked in the given order:
 The following libraries have to be linked in the given order:
 
 
-    embb_base_c, mtapi_c
+    embb_mtapi_c, embb_base_c
 
 
 The C header files can be included as follows:
 The C header files can be included as follows:
 
 

tasks_cpp/test/tasks_cpp_test_task.cc

@@ -78,13 +78,19 @@ void TaskTest::TestBasic() {
   PT_EXPECT_EQ(policy.GetPriority(), 0u);
   PT_EXPECT_EQ(policy.GetPriority(), 0u);
   policy.AddWorker(0u);
   policy.AddWorker(0u);
   PT_EXPECT_EQ(policy.GetAffinity(), 1u);
   PT_EXPECT_EQ(policy.GetAffinity(), 1u);
-  policy.AddWorker(1u);
-  PT_EXPECT_EQ(policy.GetAffinity(), 3u);
+
+  if (policy.GetCoreCount() > 1) {
+    policy.AddWorker(1u);
+    PT_EXPECT_EQ(policy.GetAffinity(), 3u);
+  }
+
   policy.RemoveWorker(0u);
   policy.RemoveWorker(0u);
-  PT_EXPECT_EQ(policy.GetAffinity(), 2u);
   PT_EXPECT_EQ(policy.IsSetWorker(0), false);
   PT_EXPECT_EQ(policy.IsSetWorker(0), false);
-  PT_EXPECT_EQ(policy.IsSetWorker(1), true);
 
 
+  if (policy.GetCoreCount() > 1) {
+    PT_EXPECT_EQ(policy.GetAffinity(), 2u);
+    PT_EXPECT_EQ(policy.IsSetWorker(1), true);
+  }
   std::string test;
   std::string test;
   embb::tasks::Task task = node.Spawn(
   embb::tasks::Task task = node.Spawn(
     embb::base::Bind(
     embb::base::Bind(