From 37b8006e20736e7cb555774246e52808547717e7 Mon Sep 17 00:00:00 2001
From: Daniel Lyubomirov <dennislt@gmail.com>
Date: Fri, 10 Jul 2020 14:57:13 +0300
Subject: [PATCH] win fixes
---
cpp/proto | 2 +-
cpp/src/vereign/core/time.hh | 20 +++++++++++++++++--
cpp/src/vereign/crypto/cert.cc | 1 +
.../vereign/crypto/test_data/.gitattributes | 1 +
4 files changed, 21 insertions(+), 3 deletions(-)
create mode 100644 cpp/tests/vereign/crypto/test_data/.gitattributes
diff --git a/cpp/proto b/cpp/proto
index 519c6f8..c581306 160000
--- a/cpp/proto
+++ b/cpp/proto
@@ -1 +1 @@
-Subproject commit 519c6f87c8cea41244c9001d4ab666ecccbade3e
+Subproject commit c581306f8816e5e8b708c9097e402354bb41b84a
diff --git a/cpp/src/vereign/core/time.hh b/cpp/src/vereign/core/time.hh
index 75747fd..120ddd8 100644
--- a/cpp/src/vereign/core/time.hh
+++ b/cpp/src/vereign/core/time.hh
@@ -26,7 +26,14 @@ auto MakePosixTime(
using namespace boost::posix_time;
using namespace boost::gregorian;
- return ptime(date{year, month, day}, time_duration(hours, seconds, milliseconds));
+ return ptime(
+ date{
+ static_cast<date::year_type>(year),
+ static_cast<date::month_type>(month),
+ static_cast<date::day_type>(day)
+ },
+ time_duration(hours, seconds, milliseconds)
+ );
}
auto MakeTimeUTC(
@@ -40,7 +47,16 @@ auto MakeTimeUTC(
using namespace boost::posix_time;
using namespace boost::gregorian;
- return PosixTimeToTime(ptime(date{year, month, day}, time_duration(hours, seconds, milliseconds)));
+ return PosixTimeToTime(
+ ptime(
+ date{
+ static_cast<date::year_type>(year),
+ static_cast<date::month_type>(month),
+ static_cast<date::day_type>(day)
+ },
+ time_duration(hours, seconds, milliseconds)
+ )
+ );
}
auto MakeTimeUTCFromString(const std::string& str) -> time_t {
diff --git a/cpp/src/vereign/crypto/cert.cc b/cpp/src/vereign/crypto/cert.cc
index 5ac2479..a715c17 100644
--- a/cpp/src/vereign/crypto/cert.cc
+++ b/cpp/src/vereign/crypto/cert.cc
@@ -7,6 +7,7 @@
#include <openssl/x509v3.h>
#include <openssl/digest.h>
#include <openssl/pem.h>
+#include <sstream>
namespace {
constexpr const char* certDefaultHashAlg = "SHA256";
diff --git a/cpp/tests/vereign/crypto/test_data/.gitattributes b/cpp/tests/vereign/crypto/test_data/.gitattributes
new file mode 100644
index 0000000..fe505b2
--- /dev/null
+++ b/cpp/tests/vereign/crypto/test_data/.gitattributes
@@ -0,0 +1 @@
+* text=false
--
GitLab