From e2991e07bc0f484fe53174a03ed0f1a7c5b03a4b Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 23 Dec 2019 19:04:54 +0100
Subject: [PATCH] Default ctor is good enough.

---
 src/kernel/context/ContextSwapped.cpp | 5 -----
 src/kernel/context/ContextSwapped.hpp | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp
index 731a0f58df..a629281d3f 100644
--- a/src/kernel/context/ContextSwapped.cpp
+++ b/src/kernel/context/ContextSwapped.cpp
@@ -38,11 +38,6 @@ namespace context {
 /* thread-specific storage for the worker's context */
 thread_local SwappedContext* SwappedContext::worker_context_ = nullptr;
 
-SwappedContextFactory::SwappedContextFactory() : ContextFactory()
-{
-  parmap_ = nullptr; // will be created lazily with the right parameters if needed (ie, in parallel)
-}
-
 SwappedContext::SwappedContext(std::function<void()>&& code, smx_actor_t actor, SwappedContextFactory* factory)
     : Context(std::move(code), actor), factory_(factory)
 {
diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp
index 532287da06..7b2eed5ee0 100644
--- a/src/kernel/context/ContextSwapped.hpp
+++ b/src/kernel/context/ContextSwapped.hpp
@@ -18,7 +18,7 @@ class SwappedContext;
 class SwappedContextFactory : public ContextFactory {
   friend SwappedContext; // Reads whether we are in parallel mode
 public:
-  SwappedContextFactory();
+  SwappedContextFactory()                             = default;
   SwappedContextFactory(const SwappedContextFactory&) = delete;
   SwappedContextFactory& operator=(const SwappedContextFactory&) = delete;
   void run_all() override;
@@ -28,8 +28,8 @@ private:
   unsigned long process_index_     = 0;       // next actor to execute
   SwappedContext* maestro_context_ = nullptr; // save maestro's context
 
-  /* For the parallel execution */
-  std::unique_ptr<simgrid::xbt::Parmap<smx_actor_t>> parmap_;
+  /* For the parallel execution, will be created lazily with the right parameters if needed (ie, in parallel) */
+  std::unique_ptr<simgrid::xbt::Parmap<smx_actor_t>> parmap_{nullptr};
 };
 
 class SwappedContext : public Context {
-- 
2.20.1