Travis: actually get the packages I just made available

[simgrid.git] / src / mc / mc_dwarf.cpp

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index ae32b74..26b5954 100644 (file)
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -14,8 +14,6 @@
 
 #include <fcntl.h>
 #include <cstdlib>
-#define DW_LANG_Objc DW_LANG_ObjC       /* fix spelling error in older dwarf.h */
-#include <dwarf.h>
 #include <elfutils/libdw.h>
 
 #include <boost/algorithm/string/predicate.hpp>
@@ -24,7 +22,7 @@
 #include "xbt/log.h"
 #include "xbt/string.hpp"
 #include "xbt/sysdep.h"
-#include <simgrid_config.h>
+#include <simgrid/config.h>
 
 #include "src/mc/mc_dwarf.hpp"
 #include "src/mc/mc_private.hpp"
@@ -403,12 +401,11 @@ static uint64_t MC_dwarf_subrange_element_count(Dwarf_Die * die,
     // This is not really 0, but the code expects this (we do not know):
     return 0;
 
-  uint64_t upper_bound =
-      MC_dwarf_attr_integrate_uint(die, DW_AT_upper_bound, -1);
+  uint64_t upper_bound = MC_dwarf_attr_integrate_uint(die, DW_AT_upper_bound, static_cast<uint64_t>(-1));
 
   uint64_t lower_bound = 0;
   if (dwarf_hasattr_integrate(die, DW_AT_lower_bound))
-    lower_bound = MC_dwarf_attr_integrate_uint(die, DW_AT_lower_bound, -1);
+    lower_bound = MC_dwarf_attr_integrate_uint(die, DW_AT_lower_bound, static_cast<uint64_t>(-1));
   else
     lower_bound = MC_dwarf_default_lower_bound(dwarf_srclang(unit));
   return upper_bound - lower_bound + 1;