From ae1540759d0f01984d3dc59dcea3e722965a4486 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Wed, 25 Nov 2015 12:02:59 +0100 Subject: [PATCH] [ns3] Fix ns3 compilation --- src/surf/network_ns3.cpp | 6 +++--- src/surf/network_ns3.hpp | 2 +- src/surf/ns3/ns3_simulator.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index b3cc211814..9bc6234beb 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -4,8 +4,8 @@ /* 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 "network_ns3.hpp" -#include "surf_private.h" +#include "src/surf/network_ns3.hpp" +#include "src/surf/surf_private.h" #include "simgrid/sg_config.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3); @@ -473,7 +473,7 @@ int NetworkNS3Action::unref() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) + if (action_hook.is_linked()) p_stateSet->erase(p_stateSet->iterator_to(*this)); XBT_DEBUG ("Removing action %p", this); delete this; diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index f452d94d9e..686feeecf8 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -7,7 +7,7 @@ #include #include "network_interface.hpp" -#include "surf/ns3/ns3_interface.h" +#include "src/surf/ns3/ns3_interface.h" #ifndef NETWORK_NS3_HPP_ #define NETWORK_NS3_HPP_ diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index 7898de3996..49d3595cb1 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cc @@ -4,7 +4,7 @@ /* 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 "surf/ns3/ns3_simulator.h" +#include "src/surf/ns3/ns3_simulator.h" #include "xbt/dict.h" #include "xbt/log.h" #include "xbt/sysdep.h" -- 2.20.1