From 95fd35f9a7b92fb507274ae567be56bf9788fbbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Tue, 25 Jun 2019 12:12:45 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@812
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src_main/containers/piqueue.h       | 13 ++++++++++---
 src_main/io_devices/pibinarylog.cpp |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src_main/containers/piqueue.h b/src_main/containers/piqueue.h
index 4b5ff69e..ea83280c 100755
--- a/src_main/containers/piqueue.h
+++ b/src_main/containers/piqueue.h
@@ -26,17 +26,24 @@
 #define PIQUEUE_H
 
 #include "pideque.h"
+#include "pivector.h"
+
 
 template<typename T>
 class PIP_EXPORT PIQueue: public PIDeque<T> {
 public:
-	PIQueue() {;}
-	virtual ~PIQueue() {;}
+	PIQueue() {}
+	virtual ~PIQueue() {}
 	PIDeque<T> & enqueue(const T & v) {PIDeque<T>::push_front(v); return *this;}
 	T dequeue() {return PIDeque<T>::take_back();}
 	T & head() {return PIDeque<T>::back();}
 	const T & head() const {return PIDeque<T>::back();}
-	PIVector<T> toVector() {PIVector<T> v(PIDeque<T>::size()); for (uint i = 0; i < PIDeque<T>::size(); ++i) v[i] = PIDeque<T>::at(i); return v;}
+	PIVector<T> toVector() {
+		PIVector<T> v(PIDeque<T>::size());
+		for (uint i = 0; i < PIDeque<T>::size(); ++i)
+			v[i] = PIDeque<T>::at(i);
+		return v;
+	}
 };
 
 #endif // PIQUEUE_H
diff --git a/src_main/io_devices/pibinarylog.cpp b/src_main/io_devices/pibinarylog.cpp
index 3709ddf9..97321721 100644
--- a/src_main/io_devices/pibinarylog.cpp
+++ b/src_main/io_devices/pibinarylog.cpp
@@ -487,13 +487,13 @@ void PIBinaryLog::parseLog(PIFile * f, PIBinaryLog::BinLogInfo * info, PIVector<
 	PIByteArray ba;
 	BinLogRecord br;
 	bool first = true;
-	llong hdr_size = sizeof(BinLogRecord) - sizeof(PIByteArray);
+	size_t hdr_size = sizeof(BinLogRecord) - sizeof(PIByteArray);
 	ba.resize(hdr_size);
 	while (1) {
 		ba.resize(hdr_size);
 		{
 			PIMutexLocker _ml(file_mutex);
-			if (f->read(ba.data(), ba.size_s()) > 0) {
+			if (f->read(ba.data(), ba.size()) > 0) {
 				ba >> br.id >> br.size >> br.timestamp;
 			} else
 				break;