Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / surf / xml / surfxml_sax_cb.cpp

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 3aa93c7489b221f68d81a837808b449cefa6737a..73d9c14d91fb17a5bf6287655f4ece1d28b00277 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -21,8 +21,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module");
 
-extern "C" {
-
 #include "simgrid_dtd.c"
 
 static const char* surf_parsed_filename; // Currently parsed file (for the error messages)
@@ -100,7 +98,6 @@ int surf_parse_get_int(std::string s)
     return -1;
   }
 }
-}
 
 namespace {
 
@@ -199,8 +196,6 @@ double surf_parse_get_value_with_unit(const char* string, const unit_scale& unit
 }
 }
 
-extern "C" {
-
 double surf_parse_get_time(const char* string, const char* entity_kind, std::string name)
 {
   static const unit_scale units{std::make_pair("w", 7 * 24 * 60 * 60),
@@ -994,4 +989,3 @@ int surf_parse()
 {
   return surf_parse_lex();
 }
-}