Ahem. You mean I need to actually compile with MC after moving files?

[simgrid.git] / teshsuite / mc / dwarf / dwarf.cpp

diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp
index 27a07ce..da8102f 100644 (file)
--- a/teshsuite/mc/dwarf/dwarf.cpp
+++ b/teshsuite/mc/dwarf/dwarf.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2019. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2019. 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. */
@@ -8,19 +7,19 @@
 #undef NDEBUG
 #endif
 
-#include <cassert>
-#include <cstring>
-
 #include <mc/mc.h>
 
 #include "mc/datatypes.h"
 #include "src/mc/mc_private.hpp"
 
-#include "src/mc/ObjectInformation.hpp"
-#include "src/mc/Type.hpp"
-#include "src/mc/Variable.hpp"
+#include "src/mc/inspect/ObjectInformation.hpp"
+#include "src/mc/inspect/Type.hpp"
+#include "src/mc/inspect/Variable.hpp"
 #include "src/mc/remote/RemoteClient.hpp"
 
+#include <cassert>
+#include <cstring>
+
 // Test broken with multi-dimensional arrays. See https://sourceware.org/bugzilla/show_bug.cgi?id=22546
 // int test_some_array[4][5][6];
 int test_some_array[4 * 5 * 6];
@@ -30,14 +29,6 @@ struct some_struct {
 };
 some_struct test_some_struct;
 
-static simgrid::mc::Type* find_type_by_name(simgrid::mc::ObjectInformation* info, const char* name)
-{
-  for (auto& entry : info->types)
-    if(entry.second.name == name)
-      return &entry.second;
-  return nullptr;
-}
-
 static simgrid::mc::Frame* find_function_by_name(
     simgrid::mc::ObjectInformation* info, const char* name)
 {
@@ -161,5 +152,5 @@ int main(int argc, char** argv)
   s_foo my_foo = {0};
   test_type_by_name(process, my_foo);
 
-  _exit(0);
+  return 0;
 }