From ad07539cb6dd411f37e1dba52d036ee0e61fb5ac Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 8 Nov 2023 13:50:01 +0100 Subject: [PATCH] Fix to compile for Linux Signed-off-by: Simon Rozman --- ZRColaWS/iconverter.hpp | 2 +- lib/libZRCola/include/zrcola/translate.h | 10 ---------- lib/stdex | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ZRColaWS/iconverter.hpp b/ZRColaWS/iconverter.hpp index a66fedc..097a88d 100644 --- a/ZRColaWS/iconverter.hpp +++ b/ZRColaWS/iconverter.hpp @@ -5,7 +5,7 @@ #pragma once -#include +#include #include #include #include diff --git a/lib/libZRCola/include/zrcola/translate.h b/lib/libZRCola/include/zrcola/translate.h index 97d48a3..a8cae4e 100644 --- a/lib/libZRCola/include/zrcola/translate.h +++ b/lib/libZRCola/include/zrcola/translate.h @@ -12,16 +12,6 @@ namespace ZRCola { class translation_db; } -/// -/// Reads translation database from a stream -/// -/// \param[in ] stream Input stream -/// \param[out] db Translation database -/// -/// \returns The stream \p stream -/// -inline std::istream& operator >>(_In_ std::istream& stream, _Out_ ZRCola::translation_db &db); - #include #include #include diff --git a/lib/stdex b/lib/stdex index fedeef0..ee8f54e 160000 --- a/lib/stdex +++ b/lib/stdex @@ -1 +1 @@ -Subproject commit fedeef0beaaf9206c38026a110f56645da964803 +Subproject commit ee8f54ee5f123f8227700d44ac121bd4ba18c0be