From 33de5a0a159da393b2b5a873f1338e86f15562d3 Mon Sep 17 00:00:00 2001 From: Claudius 'keldu' Holeksa Date: Thu, 5 Sep 2024 16:50:25 +0200 Subject: Fix incompabitable types --- modules/codec-unit/c++/SConscript | 6 +++--- modules/io_codec/c++/io_peer.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/codec-unit/c++/SConscript b/modules/codec-unit/c++/SConscript index 241ddcf..b35fdfd 100644 --- a/modules/codec-unit/c++/SConscript +++ b/modules/codec-unit/c++/SConscript @@ -21,12 +21,12 @@ env.headers += codec_unit_env.headers; ## Shared lib objects_shared = [] codec_unit_env.add_source_files(objects_shared, codec_unit_env.sources, shared=True); -env.library_shared = codec_unit_env.SharedLibrary('#build/forstio-codec-json', [objects_shared]); +env.library_shared = codec_unit_env.SharedLibrary('#build/forstio-codec-unit', [objects_shared]); ## Static lib objects_static = [] codec_unit_env.add_source_files(objects_static, codec_unit_env.sources, shared=False); -env.library_static = codec_unit_env.StaticLibrary('#build/forstio-codec-json', [objects_static]); +env.library_static = codec_unit_env.StaticLibrary('#build/forstio-codec-unit', [objects_static]); # Set Alias env.Alias('library_codec_unit', [env.library_shared, env.library_static]); @@ -35,4 +35,4 @@ env.targets += ['library_codec_unit']; # Install env.Install('$prefix/lib/', [env.library_shared, env.library_static]); -env.Install('$prefix/include/forstio/codec/json/', [codec_unit_env.headers]); +env.Install('$prefix/include/forstio/codec/unit/', [codec_unit_env.headers]); diff --git a/modules/io_codec/c++/io_peer.hpp b/modules/io_codec/c++/io_peer.hpp index bd0af69..0cb3959 100644 --- a/modules/io_codec/c++/io_peer.hpp +++ b/modules/io_codec/c++/io_peer.hpp @@ -10,7 +10,7 @@ namespace saw { template + typename BufferT = ring_buffer> class streaming_io_peer { private: static_assert(not std::is_same_v, "The native encoding by definition is not fit for transport."); -- cgit v1.2.3