Reduce the amount of implicit include directories

[simgrid.git] / src / instr / instr_paje_values.c

diff --git a/src/instr/instr_paje_values.c b/src/instr/instr_paje_values.c
index b6f1e60..a45729b 100644 (file)
--- a/src/instr/instr_paje_values.c
+++ b/src/instr/instr_paje_values.c
@@ -1,11 +1,10 @@
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012-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. */
-#include "instr/instr_private.h"
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef HAVE_TRACING
+#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 
@@ -32,15 +31,16 @@ val_t PJ_value_new (const char *name, const char *color, type_t father)
 
 val_t PJ_value_get_or_new (const char *name, const char *color, type_t father)
 {
+  val_t ret = 0;
   xbt_ex_t e;
   TRY {
-    return PJ_value_get(name, father);
+    ret = PJ_value_get(name, father);
   }
   CATCH(e) {
     xbt_ex_free(e);
-    return PJ_value_new(name, color, father);
+    ret = PJ_value_new(name, color, father);
   }
-  THROW_IMPOSSIBLE;
+  return ret;
 }
 
 val_t PJ_value_get (const char *name, type_t father)
@@ -69,6 +69,3 @@ void PJ_value_free (val_t value)
   xbt_free(((val_t)value)->id);
   xbt_free(value);
 }
-
-
-#endif