Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp

2018-04-27 02:42:20 +01:00
parent b7ce21038a f42cc19aad 4bcd05a620 1e6b57675b
commit 1fe0bb76b9
120 changed files with 2652 additions and 1496 deletions
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -37,9 +37,6 @@
 StationPool _station_pool("Station");
 INSTANTIATE_POOL_METHODS(Station)

-typedef StationIDStack::SmallStackPool StationIDStackPool;
-template<> StationIDStackPool StationIDStack::_pool = StationIDStackPool();
-
 BaseStation::~BaseStation()
 {
 	free(this->name);