From 59567e30c6c508dc84bb715df5a472f6cc7738f1 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@cs.fau.de>
Date: Fri, 27 Nov 2020 21:17:58 +0100
Subject: [PATCH] [gitlab-ci] Use flowdalic/debian-testing-dev:1.3 as container
 image

And fix the #include issues reported by the newer IWYU version.
---
 .gitlab-ci.yml            | 4 +---
 emper/ContextManager.cpp  | 1 -
 emper/Dispatcher.hpp      | 1 -
 emper/Fiber.hpp           | 1 -
 emper/c_emper.cpp         | 2 --
 eval/Locality.cpp         | 1 -
 tests/AlarmActorTest.cpp  | 5 +++--
 tests/SimpleActorTest.cpp | 9 +++++----
 tests/SimpleLawsTest.cpp  | 1 -
 9 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a03bf28..b630549a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,6 @@
-image: "flowdalic/debian-dev:1.13"
+image: "flowdalic/debian-testing-dev:1.3"
 
 before_script:
-  - apt update && apt install -y pkg-config
-  - apt install -y -t testing liburcu-dev
   - |
     readarray TOOLS <<EOF
     c++
diff --git a/emper/ContextManager.cpp b/emper/ContextManager.cpp
index 7e44c2cf..0ac4f674 100644
--- a/emper/ContextManager.cpp
+++ b/emper/ContextManager.cpp
@@ -3,7 +3,6 @@
 #include "ContextManager.hpp"
 
 #include <cassert>	// for assert
-#include <new>			// for operator new, operator delete
 #include <utility>
 
 #include "Context.hpp"		 // for Context
diff --git a/emper/Dispatcher.hpp b/emper/Dispatcher.hpp
index aeccd68e..47cfeb73 100644
--- a/emper/Dispatcher.hpp
+++ b/emper/Dispatcher.hpp
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <cassert>	// for assert
-#include <new>			// for operator delete
 
 #include "Common.hpp"			 // for func_t
 #include "Debug.hpp"			 // for LOGD, LogSubsystem, LogSubsystem::DISP
diff --git a/emper/Fiber.hpp b/emper/Fiber.hpp
index 4723eaf5..6c2da785 100644
--- a/emper/Fiber.hpp
+++ b/emper/Fiber.hpp
@@ -6,7 +6,6 @@
 #include <cassert>			// for assert
 #include <functional>		// for function
 #include <iosfwd>				// for ostream
-#include <new>					// for operator new
 #include <type_traits>	// for remove_reference<>::type // IWYU pragma: keep
 #include <utility>
 
diff --git a/emper/c_emper.cpp b/emper/c_emper.cpp
index d528eb91..79e4c730 100644
--- a/emper/c_emper.cpp
+++ b/emper/c_emper.cpp
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright © 2020 Florian Schmaus
-#include <new>	// for operator new
-
 #include "BinaryPrivateSemaphore.hpp"		 // for BinaryPrivateSemaphore, BPS
 #include "CountingPrivateSemaphore.hpp"	 // for CountingPrivateSemaphore, CPS
 #include "Fiber.hpp"										 // for Fiber, Fiber::NOT_AFFINE
diff --git a/eval/Locality.cpp b/eval/Locality.cpp
index 77838460..24c7249b 100644
--- a/eval/Locality.cpp
+++ b/eval/Locality.cpp
@@ -7,7 +7,6 @@
 #include <cstdint>		// for uint8_t, UINT8_MAX
 #include <cstdlib>		// for abort, exit, EXIT_SUCCESS
 #include <iostream>		// for operator<<, basic_ostream
-#include <new>				// for operator new
 #include <random>			// for mt19937, uniform_int_dis...
 #include <string>			// for string, operator<<, oper...
 
diff --git a/tests/AlarmActorTest.cpp b/tests/AlarmActorTest.cpp
index e83ac8ec..bad812f0 100644
--- a/tests/AlarmActorTest.cpp
+++ b/tests/AlarmActorTest.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright © 2020 Florian Fischer
-#include <cstdlib>	 // for exit, EXIT_FAILURE, EXIT_SUC...
-#include <iostream>	 // for operator<<, basic_ostream
+#include <algorithm>	// for copy
+#include <cstdlib>		// for exit, EXIT_FAILURE, EXIT_SUC...
+#include <iostream>		// for operator<<, basic_ostream
 
 #include "Actor.hpp"										 // for Actor
 #include "BinaryPrivateSemaphore.hpp"		 // for BPS
diff --git a/tests/SimpleActorTest.cpp b/tests/SimpleActorTest.cpp
index cf7e49d0..5fe140a5 100644
--- a/tests/SimpleActorTest.cpp
+++ b/tests/SimpleActorTest.cpp
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright © 2020 Florian Schmaus
-#include <atomic>		 // for atomic_thread_fence, memory_...
-#include <cstdint>	 // for uint64_t
-#include <cstdlib>	 // for exit, EXIT_FAILURE, EXIT_SUC...
-#include <iostream>	 // for operator<<, basic_ostream
+#include <algorithm>	// for copy
+#include <atomic>			// for atomic_thread_fence, memory_...
+#include <cstdint>		// for uint64_t
+#include <cstdlib>		// for exit, EXIT_FAILURE, EXIT_SUC...
+#include <iostream>		// for operator<<, basic_ostream
 
 #include "Actor.hpp"										 // for Actor
 #include "CountingPrivateSemaphore.hpp"	 // for CPS
diff --git a/tests/SimpleLawsTest.cpp b/tests/SimpleLawsTest.cpp
index 7369dee0..c4fb8177 100644
--- a/tests/SimpleLawsTest.cpp
+++ b/tests/SimpleLawsTest.cpp
@@ -5,7 +5,6 @@
 #include <cstdlib>	 // for free, exit, EXIT_FAILURE
 #include <cstring>	 // for memset
 #include <iostream>	 // for operator<<, endl, basic_...
-#include <new>			 // for operator new[]
 #include <random>		 // for mt19937_64, random_device
 
 #include "Common.hpp"												 // for ALIGN_TO_CACHE_LINE
-- 
GitLab