From e1ebcb053f5d9a8c63340c0532985209e12d86ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Recoules?= Date: Fri, 24 Feb 2023 16:46:02 +0100 Subject: [PATCH] prepare for fix 0.0.5 --- CHANGES.md | 4 ++++ dune | 7 ++++--- dune-project | 2 +- unisim/util/hypapp/hypapp.cc | 6 ++---- unisim/util/hypapp/hypapp.hh | 2 +- unisim_archisec.opam | 4 ++-- unisim_archisec.opam.template | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ed5f742..5ecb97d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +## 0.0.5 (2023-02-24) + +- enable macOS Homebrew distribution + ## 0.0.4 (2023-02-15) - better handling of x86 flags diff --git a/dune b/dune index c4e9a02..1dda9bf 100644 --- a/dune +++ b/dune @@ -1,7 +1,7 @@ (env (_ - (c_flags :standard -g0) - (cxx_flags :standard -g0))) + (c_flags :standard -std=gnu11 -g0) + (cxx_flags :standard -std=gnu++11 -g0))) (subdir unisim/util @@ -343,6 +343,7 @@ (test (name unittest) - (modes (best exe)) + (modes + (best exe)) (modules unittest) (libraries arm32dba aarch64dba amd64dba)) diff --git a/dune-project b/dune-project index a8023f6..0cd2e8f 100644 --- a/dune-project +++ b/dune-project @@ -2,7 +2,7 @@ (generate_opam_files true) (name unisim_archisec) -(version "0.0.4") +(version "0.0.5") (maintainers "BINSEC ") (authors "Yves Lhuillier" diff --git a/unisim/util/hypapp/hypapp.cc b/unisim/util/hypapp/hypapp.cc index 0efaa49..424520d 100644 --- a/unisim/util/hypapp/hypapp.cc +++ b/unisim/util/hypapp/hypapp.cc @@ -266,9 +266,8 @@ HttpRequest::HttpRequest(const Request& _req, std::ostream& _log, std::ostream& , log(_log) , warn_log(_warn_log) , err_log(_err_log) + , std::istream(&content_stream_buffer) { - rdbuf(&content_stream_buffer); - unsigned int part_count = req.GetPartCount(); parts.reserve(part_count); for(unsigned int part_num = 0; part_num < part_count; part_num++) @@ -343,9 +342,8 @@ HttpRequest::HttpRequest(const std::string& _server_root, const std::string& _pa , log(http_request.log) , warn_log(http_request.warn_log) , err_log(http_request.err_log) + , std::istream(&content_stream_buffer) { - rdbuf(&content_stream_buffer); - unsigned int part_count = req.GetPartCount(); for(unsigned int part_num = 0; part_num < part_count; part_num++) { diff --git a/unisim/util/hypapp/hypapp.hh b/unisim/util/hypapp/hypapp.hh index c6983dc..68fffd7 100644 --- a/unisim/util/hypapp/hypapp.hh +++ b/unisim/util/hypapp/hypapp.hh @@ -252,8 +252,8 @@ public: HttpRequestPart(const RequestPart& _part) : part(_part) , content_stream_buffer(part.GetContent(), part.GetContentLength(), 0) + , std::istream(&content_stream_buffer) { - rdbuf(&content_stream_buffer); } unsigned int GetContentLength() const { return part.GetContentLength(); } diff --git a/unisim_archisec.opam b/unisim_archisec.opam index cafba2d..1a0b788 100644 --- a/unisim_archisec.opam +++ b/unisim_archisec.opam @@ -1,6 +1,6 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" -version: "0.0.4" +version: "0.0.5" synopsis: "UNISIM-VP DBA decoder" description: """ @@ -36,4 +36,4 @@ build: [ ] ] dev-repo: "git+https://github.com/binsec/unisim_archisec.git" -available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" | os-version >= 8) ] +available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" | os-version >= 8) | os = "macos" & os-distribution = "homebrew" ] diff --git a/unisim_archisec.opam.template b/unisim_archisec.opam.template index b2f82e8..35bd885 100644 --- a/unisim_archisec.opam.template +++ b/unisim_archisec.opam.template @@ -1 +1 @@ -available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" | os-version >= 8) ] +available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" | os-version >= 8) | os = "macos" & os-distribution = "homebrew" ]