diff --git a/common/libBuffer/include/CommonFWriteBufferFlusher.h b/common/libBuffer/include/CommonFWriteBufferFlusher.h
index c7af45b2..62b0f991 100644
--- a/common/libBuffer/include/CommonFWriteBufferFlusher.h
+++ b/common/libBuffer/include/CommonFWriteBufferFlusher.h
@@ -58,7 +58,11 @@ namespace Common
 #else
 		typedef __int64 FilePosType;
 #endif
+#if defined(__GNUC__) && !defined(_LIBCPP_VERSION) && !((defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) || (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__)))
 	typedef std::tr1::unordered_map<MarkId, FilePosType > MarkIdToFilePos;
+#else
+	typedef std::unordered_map<MarkId, FilePosType > MarkIdToFilePos;
+#endif
 
 	public:
 		static const size_t DEFAUL_BUFFER_SIZE = 64*1024;