From aee2b2495f44ab4160182bfd8b0f0a9926339549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Garapich?= <michal@garapich.pl>
Date: Mon, 9 Mar 2015 23:09:01 +0100
Subject: [PATCH] Two fixes for linux-g++

* Added missing typename in TimestampObjectList
* Renamed blacksim.a to libblacksim.a in cli_client's qmake
---
 samples/cli_client/sample_cli_client.pro | 2 +-
 src/blackmisc/timestampobjectlist.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cli_client/sample_cli_client.pro
index 94464d205..17010e6cc 100644
--- a/samples/cli_client/sample_cli_client.pro
+++ b/samples/cli_client/sample_cli_client.pro
@@ -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
 
diff --git a/src/blackmisc/timestampobjectlist.cpp b/src/blackmisc/timestampobjectlist.cpp
index 98b392bbb..a4900527a 100644
--- a/src/blackmisc/timestampobjectlist.cpp
+++ b/src/blackmisc/timestampobjectlist.cpp
@@ -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;
             }