X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..2f6b0aa5c5a2fada81b8593c0ba9d930a7ce41d2:/src/mc/LocationList.hpp

diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index 830f02437e..5fa74b3071 100644
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2015. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -15,8 +14,8 @@
 #include <dwarf.h>
 #include <elfutils/libdw.h>
 
-#include <xbt/base.h>
-#include <xbt/range.hpp>
+#include "xbt/base.h"
+#include "xbt/range.hpp"
 
 #include "src/mc/mc_base.h"
 #include "src/mc/mc_forward.hpp"
@@ -38,9 +37,7 @@ public:
   LocationListEntry(DwarfExpression expression, range_type range)
     : expression_(std::move(expression)), range_(range)
   {}
-  LocationListEntry(DwarfExpression expression)
-    : expression_(std::move(expression)), range_({0, UINT64_MAX})
-  {}
+  LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)), range_({0, UINT64_MAX}) {}
 
   DwarfExpression& expression()
   {
@@ -65,11 +62,11 @@ typedef std::vector<LocationListEntry> LocationList;
 class Location {
 private:
   void* memory_;
-  int register_id_;
+  int register_id_ = 0;
+
 public:
-  Location(void* x) :memory_(x) {}
-  Location(int register_id) :
-    memory_(nullptr), register_id_(register_id) {}
+  explicit Location(void* x) : memory_(x) {}
+  explicit Location(int register_id) : memory_(nullptr), register_id_(register_id) {}
   // Type of location:
   bool in_register() const { return memory_ == nullptr; }
   bool in_memory()   const { return memory_ != nullptr; }