From 004d8063a27d88c3188a96e9ee02001ba43940cb Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 11 Feb 2016 00:01:07 +0100 Subject: [PATCH] Get ride of a stupidly empty header file --- src/surf/surf_private.h | 8 +++++--- src/surf/surfxml_parse.cpp | 1 - src/surf/surfxml_parseplatf.cpp | 1 - src/surf/surfxml_private.h | 17 ----------------- tools/cmake/DefinePackages.cmake | 1 - 5 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 src/surf/surfxml_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index d59ad240bd..e2ecdcbd9e 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -82,12 +82,14 @@ XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict /** * Resource protected methods */ -XBT_PUBLIC(void) surfxml_bufferstack_push(int _new); -XBT_PUBLIC(void) surfxml_bufferstack_pop(int _new); -XBT_PUBLIC(void) parse_after_config(void); +XBT_PRIVATE void surfxml_bufferstack_push(int _new); +XBT_PRIVATE void surfxml_bufferstack_pop(int _new); +XBT_PRIVATE void parse_after_config(void); XBT_PUBLIC_DATA(int) surfxml_bufferstack_size; +XBT_PRIVATE void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect); + /********** Tracing **********/ /* from surf_instr.c */ void TRACE_surf_host_set_speed(double date, const char *resource, double power); diff --git a/src/surf/surfxml_parse.cpp b/src/surf/surfxml_parse.cpp index da1c63d40b..15fa5f2970 100644 --- a/src/surf/surfxml_parse.cpp +++ b/src/surf/surfxml_parse.cpp @@ -15,7 +15,6 @@ #include "xbt/dict.h" #include "src/surf/surf_private.h" #include "simgrid/sg_config.h" -#include "surfxml_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); diff --git a/src/surf/surfxml_parseplatf.cpp b/src/surf/surfxml_parseplatf.cpp index eaa30d65ac..3e889ee5cb 100644 --- a/src/surf/surfxml_parseplatf.cpp +++ b/src/surf/surfxml_parseplatf.cpp @@ -11,7 +11,6 @@ #include "simgrid/platf.h" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/surfxml_private.h" #ifdef HAVE_LUA extern "C" { diff --git a/src/surf/surfxml_private.h b/src/surf/surfxml_private.h deleted file mode 100644 index dc69ca1e12..0000000000 --- a/src/surf/surfxml_private.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright (c) 2016. 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. */ - -#ifndef SRC_SURF_SURFXML_PRIVATE_H_ -#define SRC_SURF_SURFXML_PRIVATE_H_ - -#include "surf/surfxml_parse.h" - -SG_BEGIN_DECL() - -void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect); - -SG_END_DECL() - -#endif /* SRC_SURF_SURFXML_PRIVATE_H_ */ diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index ba6e98c10d..626e32f046 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -337,7 +337,6 @@ set(SURF_SRC src/surf/surf_routing_generic.cpp src/surf/surf_routing_none.cpp src/surf/surf_routing_vivaldi.cpp - src/surf/surfxml_private.h src/surf/surfxml_parse.cpp src/surf/surfxml_parseplatf.cpp src/surf/trace_mgr.hpp -- 2.20.1