mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 14:55:36 +08:00
Two fixes for linux-g++
* Added missing typename in TimestampObjectList * Renamed blacksim.a to libblacksim.a in cli_client's qmake
This commit is contained in:
committed by
Klaus Basan
parent
3560508154
commit
aee2b2495f
@@ -21,7 +21,7 @@ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
|
||||
../../lib/blacksim.lib
|
||||
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \
|
||||
../../lib/libblackcore.a \
|
||||
../../lib/blacksim.a
|
||||
../../lib/libblacksim.a
|
||||
|
||||
DESTDIR = ../../bin
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace BlackMisc
|
||||
if (it->isOlderThan(msSinceEpoch))
|
||||
{
|
||||
// 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());
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user