Remove useless includes for xbt/str.h.

diff --git a/examples/s4u/app-masterworker/s4u-app-masterworker.cpp b/examples/s4u/app-masterworker/s4u-app-masterworker.cpp
index d360480..e21badf 100644 (file)
--- a/examples/s4u/app-masterworker/s4u-app-masterworker.cpp
+++ b/examples/s4u/app-masterworker/s4u-app-masterworker.cpp
@@ -3,7 +3,6 @@
 /* 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. */
 
 /* 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 "xbt/str.h"

 #include "xbt/sysdep.h"
 #include <simgrid/s4u.hpp>
 #include <string>
 #include "xbt/sysdep.h"
 #include <simgrid/s4u.hpp>
 #include <string>

diff --git a/examples/s4u/app-token-ring/s4u-app-token-ring.cpp b/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
index ce84f9c..7f242e4 100644 (file)
--- a/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
+++ b/examples/s4u/app-token-ring/s4u-app-token-ring.cpp
@@ -3,7 +3,6 @@
 /* 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. */
 
 /* 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 "xbt/str.h"

 #include <simgrid/s4u.hpp>
 #include <algorithm>
 #include <string>
 #include <simgrid/s4u.hpp>
 #include <algorithm>
 #include <string>

diff --git a/examples/s4u/async-wait/s4u-async-wait.cpp b/examples/s4u/async-wait/s4u-async-wait.cpp
index b4c36a6..7742cca 100644 (file)
--- a/examples/s4u/async-wait/s4u-async-wait.cpp
+++ b/examples/s4u/async-wait/s4u-async-wait.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "simgrid/s4u.hpp"
  */
 
 #include "simgrid/s4u.hpp"

-#include "xbt/str.h"

 #include <cstdlib>
 #include <iostream>
 
 #include <cstdlib>
 #include <iostream>
 

diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp
index 405e049..270894f 100644 (file)
--- a/examples/s4u/async-waitall/s4u-async-waitall.cpp
+++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp
@@ -13,7 +13,6 @@
  */
 
 #include "simgrid/s4u.hpp"
  */
 
 #include "simgrid/s4u.hpp"

-#include "xbt/str.h"

 #include <cstdlib>
 #include <iostream>
 
 #include <cstdlib>
 #include <iostream>
 

diff --git a/examples/s4u/async-waitany/s4u-async-waitany.cpp b/examples/s4u/async-waitany/s4u-async-waitany.cpp
index 706fd08..d94b036 100644 (file)
--- a/examples/s4u/async-waitany/s4u-async-waitany.cpp
+++ b/examples/s4u/async-waitany/s4u-async-waitany.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "simgrid/s4u.hpp"
  */
 
 #include "simgrid/s4u.hpp"

-#include "xbt/str.h"

 #include <cstdlib>
 #include <iostream>
 
 #include <cstdlib>
 #include <iostream>
 

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 8aaefaf..e61201c 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
+/* Copyright (c) 2008-2017. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -6,7 +6,6 @@
 
 #include "xbt/config.h"
 #include "xbt/log.h"
 
 #include "xbt/config.h"
 #include "xbt/log.h"

-#include <xbt/str.h>

 #include <xbt/sysdep.h>
 
 #include <mc/mc.h>
 #include <xbt/sysdep.h>
 
 #include <mc/mc.h>

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index ac5d691..d061716 100644 (file)
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -9,7 +9,6 @@
 #include "xbt/file.h" /* xbt_basename() */
 #include "xbt/log.h"
 #include "xbt/misc.h"
 #include "xbt/file.h" /* xbt_basename() */
 #include "xbt/log.h"
 #include "xbt/misc.h"

-#include "xbt/str.h"

 #include <map>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
 #include <map>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 0da6263..0c10cd4 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -11,7 +11,6 @@
 #include "xbt/config.hpp"
 #include "xbt/log.h"
 #include "xbt/mallocator.h"
 #include "xbt/config.hpp"
 #include "xbt/log.h"
 #include "xbt/mallocator.h"

-#include "xbt/str.h"

 #include "xbt/sysdep.h"
 #include "surf/surf.h"
 #include "surf/maxmin.h"
 #include "xbt/sysdep.h"
 #include "surf/surf.h"
 #include "surf/maxmin.h"

diff --git a/src/smpi/internals/smpi_utils.cpp b/src/smpi/internals/smpi_utils.cpp
index 0a043ae..86594e1 100644 (file)
--- a/src/smpi/internals/smpi_utils.cpp
+++ b/src/smpi/internals/smpi_utils.cpp
@@ -7,7 +7,6 @@
 #include "smpi/smpi_utils.hpp"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "smpi/smpi_utils.hpp"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"

-#include "xbt/str.h"

 #include <boost/tokenizer.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_utils, smpi, "Logging specific to SMPI (utils)");
 #include <boost/tokenizer.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_utils, smpi, "Logging specific to SMPI (utils)");

diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp
index df5f1ee..dbbf1ae 100644 (file)
--- a/src/surf/trace_mgr.cpp
+++ b/src/surf/trace_mgr.cpp
@@ -6,7 +6,6 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"

-#include "xbt/str.h"

 
 #include "src/surf/surf_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 
 #include "src/surf/surf_interface.hpp"
 #include "src/surf/trace_mgr.hpp"

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 0e4d96d..f3f0e08 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2015. The SimGrid Team.
+/* Copyright (c) 2006-2017. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -9,7 +9,6 @@
 #include "src/surf/network_interface.hpp"
 #include "xbt/log.h"
 #include "xbt/misc.h"
 #include "src/surf/network_interface.hpp"
 #include "xbt/log.h"
 #include "xbt/misc.h"

-#include "xbt/str.h"

 #include <vector>
 
 #include "src/surf/xml/platf_private.hpp"
 #include <vector>
 
 #include "src/surf/xml/platf_private.hpp"

diff --git a/src/xbt/backtrace_linux.cpp b/src/xbt/backtrace_linux.cpp
index 7fa8051..9bcdf55 100644 (file)
--- a/src/xbt/backtrace_linux.cpp
+++ b/src/xbt/backtrace_linux.cpp
@@ -21,7 +21,6 @@
 #include <xbt/backtrace.hpp>
 #include "xbt/ex.h"
 #include "xbt/log.h"
 #include <xbt/backtrace.hpp>
 #include "xbt/ex.h"
 #include "xbt/log.h"

-#include "xbt/str.h"

 #include "xbt/module.h"         /* xbt_binary_name */
 #include "src/xbt_modinter.h"       /* backtrace initialization headers */
 #if SIMGRID_HAVE_MC
 #include "xbt/module.h"         /* xbt_binary_name */
 #include "src/xbt_modinter.h"       /* backtrace initialization headers */
 #if SIMGRID_HAVE_MC

diff --git a/src/xbt/ex.cpp b/src/xbt/ex.cpp
index f609b1d..f167d6d 100644 (file)
--- a/src/xbt/ex.cpp
+++ b/src/xbt/ex.cpp
@@ -52,7 +52,6 @@
 #include "xbt/log.hpp"
 #include "xbt/backtrace.h"
 #include "xbt/backtrace.hpp"
 #include "xbt/log.hpp"
 #include "xbt/backtrace.h"
 #include "xbt/backtrace.hpp"

-#include "xbt/str.h"

 #include "src/xbt_modinter.h"       /* backtrace initialization headers */
 
 #include "simgrid/sg_config.h"  /* Configuration mechanism of SimGrid */
 #include "src/xbt_modinter.h"       /* backtrace initialization headers */
 
 #include "simgrid/sg_config.h"  /* Configuration mechanism of SimGrid */

diff --git a/src/xbt/graph.c b/src/xbt/graph.c
index 42c211f..b82a581 100644 (file)
--- a/src/xbt/graph.c
+++ b/src/xbt/graph.c
@@ -1,6 +1,6 @@
 /* a generic graph library.                                                 */
 
 /* a generic graph library.                                                 */
 

-/* Copyright (c) 2006-2014. The SimGrid Team.
+/* Copyright (c) 2006-2017. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -12,7 +12,6 @@
 #include "graph_private.h"
 #include "xbt/dict.h"
 #include "xbt/heap.h"
 #include "graph_private.h"
 #include "xbt/dict.h"
 #include "xbt/heap.h"

-#include "xbt/str.h"

 #include "xbt/file.h"
 
 #include <errno.h>
 #include "xbt/file.h"
 
 #include <errno.h>