Fix conflict - Adrien

[simgrid.git] / src / surf / network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 37ee98e7020c7d5be299a87a6921ffeb5c239308..c9de3c520d82830acd51ee1dda86cf31930e21a8 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -79,6 +79,7 @@ Link **Link::linksList() {
 void Link::linksExit() {
        for (auto kv : *links)
                delete (kv.second);
+       delete links;
 }
 /*************
  * Callbacks *