flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Two fixes for linux-g++

Browse Source 
* Added missing typename in TimestampObjectList
* Renamed blacksim.a to libblacksim.a in cli_client's qmake
This commit is contained in:
Michał Garapich
2015-03-09 23:09:01 +01:00
committed by Klaus Basan
parent 3560508154
commit aee2b2495f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/cli_client/sample_cli_client.pro
View File

@@ -21,7 +21,7 @@ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
../../lib/blacksim.lib ../../lib/blacksim.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \
../../lib/libblackcore.a \ ../../lib/libblackcore.a \
../../lib/blacksim.a ../../lib/libblacksim.a
DESTDIR = ../../bin DESTDIR = ../../bin

2
src/blackmisc/timestampobjectlist.cpp
View File

@@ -69,7 +69,7 @@ namespace BlackMisc
if (it->isOlderThan(msSinceEpoch)) if (it->isOlderThan(msSinceEpoch))
{ {
// better "move", ?? std::make_move_iterator // better "move", ?? std::make_move_iterator
older.insert(CRange<CONTAINER::iterator>(it, newer.end())); older.insert(CRange<typename CONTAINER::iterator>(it, newer.end()));
newer.erase(it, newer.end()); newer.erase(it, newer.end());
break; break;
} }