diff options
| author | Christian Pointner <equinox@anytun.org> | 2014-06-29 00:06:23 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2014-06-29 00:06:23 +0000 |
| commit | 92a551b96e625257def26771155ebd64c6d8757e (patch) | |
| tree | 7d5b2d0a043f746bfb10ccc9679ac59646a95b72 /src/routingTable.cpp | |
| parent | while(1) vs. for(;;) (diff) | |
fixed not working singletons - still not threadsafe but at least they don't pretend to be
Diffstat (limited to 'src/routingTable.cpp')
| -rw-r--r-- | src/routingTable.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/routingTable.cpp b/src/routingTable.cpp index 82b302a..a802ecf 100644 --- a/src/routingTable.cpp +++ b/src/routingTable.cpp @@ -37,20 +37,12 @@ #include "routingTable.h" #include "routingTree.hpp" -RoutingTable* RoutingTable::inst = NULL; -Mutex RoutingTable::instMutex; RoutingTable& gRoutingTable = RoutingTable::instance(); - RoutingTable& RoutingTable::instance() { - Lock lock(instMutex); - static instanceCleaner c; - if(!inst) { - inst = new RoutingTable(); - } - - return *inst; + static RoutingTable instance; + return instance; } RoutingTable::RoutingTable() |