From b2c7e91fe1041bb721c5d757c7fe4cebe324d909 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Mon, 27 Aug 2018 13:08:01 +0200
Subject: [PATCH] fix windows tests
---
producer/api/include/producer/common.h | 2 +-
producer/api/src/producer_impl.cpp | 2 +-
producer/api/src/producer_impl.h | 2 +-
.../event_monitor_producer/src/system_folder_watch_windows.h | 5 +++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/producer/api/include/producer/common.h b/producer/api/include/producer/common.h
index 90b8a954b..e8c0d8522 100644
--- a/producer/api/include/producer/common.h
+++ b/producer/api/include/producer/common.h
@@ -21,7 +21,7 @@ enum class RequestHandlerType {
struct EventHeader {
uint64_t file_id;
- size_t file_size;
+ uint64_t file_size;
std::string file_name;
};
diff --git a/producer/api/src/producer_impl.cpp b/producer/api/src/producer_impl.cpp
index 7c53a0bf7..c7e4c26f3 100644
--- a/producer/api/src/producer_impl.cpp
+++ b/producer/api/src/producer_impl.cpp
@@ -27,7 +27,7 @@ ProducerImpl::ProducerImpl(std::string endpoint, uint8_t n_processing_threads, a
request_pool__.reset(new RequestPool{n_processing_threads, request_handler_factory_.get()});
}
-GenericRequestHeader ProducerImpl::GenerateNextSendRequest(uint64_t file_id, size_t file_size, std::string file_name) {
+GenericRequestHeader ProducerImpl::GenerateNextSendRequest(uint64_t file_id, uint64_t file_size, std::string file_name) {
GenericRequestHeader request{kOpcodeTransferData, file_id, file_size, std::move(file_name)};
return request;
}
diff --git a/producer/api/src/producer_impl.h b/producer/api/src/producer_impl.h
index f2359052e..55d6e7bbb 100644
--- a/producer/api/src/producer_impl.h
+++ b/producer/api/src/producer_impl.h
@@ -34,7 +34,7 @@ class ProducerImpl : public Producer {
Error SetBeamtimeId(std::string beamtime_id) override;
private:
- GenericRequestHeader GenerateNextSendRequest(uint64_t file_id, size_t file_size, std::string file_name);
+ GenericRequestHeader GenerateNextSendRequest(uint64_t file_id, uint64_t file_size, std::string file_name);
std::string beamtime_id_;
};
diff --git a/producer/event_monitor_producer/src/system_folder_watch_windows.h b/producer/event_monitor_producer/src/system_folder_watch_windows.h
index 61ce57d5d..cf55b0e27 100644
--- a/producer/event_monitor_producer/src/system_folder_watch_windows.h
+++ b/producer/event_monitor_producer/src/system_folder_watch_windows.h
@@ -13,8 +13,9 @@
namespace asapo {
class SystemFolderWatch {
- Error StartFolderMonitor(const std::vector<std::string>& monitored_folders);
- FileEvents GetFileEventList(Error* err);
+ public:
+ VIRTUAL Error StartFolderMonitor(const std::vector<std::string>& monitored_folders);
+ VIRTUAL FileEvents GetFileEventList(Error* err);
};
--
GitLab