From 3c38fade1bd0e58a81a3b7f3f2316a598fcaf5ce Mon Sep 17 00:00:00 2001
From: James Smith <james@foxglove.dev>
Date: Thu, 7 Nov 2024 14:53:43 +1100
Subject: [PATCH] cpp: add optional flush method to IWritable

---
 cpp/bench/conanfile.py           | 2 +-
 cpp/build-docs.sh                | 2 +-
 cpp/build.sh                     | 2 +-
 cpp/docs/conanfile.py            | 2 +-
 cpp/examples/conanfile.py        | 2 +-
 cpp/mcap/conanfile.py            | 2 +-
 cpp/mcap/include/mcap/types.hpp  | 2 +-
 cpp/mcap/include/mcap/writer.hpp | 2 +-
 cpp/test/conanfile.py            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cpp/bench/conanfile.py b/cpp/bench/conanfile.py
index ffc1efff3..ac269a750 100644
--- a/cpp/bench/conanfile.py
+++ b/cpp/bench/conanfile.py
@@ -4,7 +4,7 @@
 class McapBenchmarksConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     generators = "cmake"
-    requires = "benchmark/1.7.0", "mcap/1.4.1"
+    requires = "benchmark/1.7.0", "mcap/1.5.0"
 
     def build(self):
         cmake = CMake(self)
diff --git a/cpp/build-docs.sh b/cpp/build-docs.sh
index f2e94fc34..4e1ae9217 100755
--- a/cpp/build-docs.sh
+++ b/cpp/build-docs.sh
@@ -4,7 +4,7 @@ set -e
 
 conan config init
 
-conan editable add ./mcap mcap/1.4.1
+conan editable add ./mcap mcap/1.5.0
 conan install docs --install-folder docs/build/Release \
   -s compiler.cppstd=17 -s build_type=Release --build missing
 
diff --git a/cpp/build.sh b/cpp/build.sh
index 9831bd1e1..bb6c2900b 100755
--- a/cpp/build.sh
+++ b/cpp/build.sh
@@ -4,7 +4,7 @@ set -e
 
 conan config init
 
-conan editable add ./mcap mcap/1.4.1
+conan editable add ./mcap mcap/1.5.0
 conan install test --install-folder test/build/Debug \
   -s compiler.cppstd=17 -s build_type=Debug --build missing
 
diff --git a/cpp/docs/conanfile.py b/cpp/docs/conanfile.py
index d1645bcff..37c4d2971 100644
--- a/cpp/docs/conanfile.py
+++ b/cpp/docs/conanfile.py
@@ -4,7 +4,7 @@
 class McapDocsConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     generators = "cmake"
-    requires = "mcap/1.4.1"
+    requires = "mcap/1.5.0"
 
     def build(self):
         cmake = CMake(self)
diff --git a/cpp/examples/conanfile.py b/cpp/examples/conanfile.py
index b3f682916..dea350803 100644
--- a/cpp/examples/conanfile.py
+++ b/cpp/examples/conanfile.py
@@ -5,7 +5,7 @@ class McapExamplesConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     generators = "cmake"
     requires = [
-        "mcap/1.4.1",
+        "mcap/1.5.0",
         "protobuf/3.21.1",
         "nlohmann_json/3.10.5",
         "catch2/2.13.8",
diff --git a/cpp/mcap/conanfile.py b/cpp/mcap/conanfile.py
index 4b91e6d42..d1c95d439 100644
--- a/cpp/mcap/conanfile.py
+++ b/cpp/mcap/conanfile.py
@@ -3,7 +3,7 @@
 
 class McapConan(ConanFile):
     name = "mcap"
-    version = "1.4.1"
+    version = "1.5.0"
     url = "https://github.com/foxglove/mcap"
     homepage = "https://github.com/foxglove/mcap"
     description = "A C++ implementation of the MCAP file format"
diff --git a/cpp/mcap/include/mcap/types.hpp b/cpp/mcap/include/mcap/types.hpp
index 16059dff6..0912f9396 100644
--- a/cpp/mcap/include/mcap/types.hpp
+++ b/cpp/mcap/include/mcap/types.hpp
@@ -13,7 +13,7 @@
 
 namespace mcap {
 
-#define MCAP_LIBRARY_VERSION "1.4.1"
+#define MCAP_LIBRARY_VERSION "1.5.0"
 
 using SchemaId = uint16_t;
 using ChannelId = uint16_t;
diff --git a/cpp/mcap/include/mcap/writer.hpp b/cpp/mcap/include/mcap/writer.hpp
index 2af6edd5b..379ae707f 100644
--- a/cpp/mcap/include/mcap/writer.hpp
+++ b/cpp/mcap/include/mcap/writer.hpp
@@ -146,7 +146,7 @@ class MCAP_PUBLIC IWritable {
   /**
    * @brief flushes any buffered data to the output. Defaults to a no-op.
    */
-  virtual void flush() = 0;
+  virtual void flush() {};
 
 protected:
   virtual void handleWrite(const std::byte* data, uint64_t size) = 0;
diff --git a/cpp/test/conanfile.py b/cpp/test/conanfile.py
index 683014746..314a0a2da 100644
--- a/cpp/test/conanfile.py
+++ b/cpp/test/conanfile.py
@@ -4,7 +4,7 @@
 class McapTestConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     generators = "cmake"
-    requires = "catch2/2.13.8", "mcap/1.4.1", "nlohmann_json/3.10.5"
+    requires = "catch2/2.13.8", "mcap/1.5.0", "nlohmann_json/3.10.5"
 
     def build(self):
         cmake = CMake(self)