diff --git a/.gitignore b/.gitignore index c4d34259..1d347888 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ output /out/build/WSL-GCC-Debug/.cmake/api/v1/reply /out/build/WSL-GCC-Debug/.cmake/api/v1/query/client-MicrosoftVS/query.json /tests/Config.h +CMakeLists.txt.user diff --git a/include/dbcppp/Message.h b/include/dbcppp/Message.h index 47dc149c..bbdeef01 100644 --- a/include/dbcppp/Message.h +++ b/include/dbcppp/Message.h @@ -29,7 +29,7 @@ namespace dbcppp , uint64_t message_size , std::string&& transmitter , std::vector&& message_transmitters - , std::vector>&& signals + , std::vector>&& signals_ , std::vector>&& attribute_values , std::string&& comment , std::vector>&& signal_groups); diff --git a/src/libdbcppp/MessageImpl.cpp b/src/libdbcppp/MessageImpl.cpp index 1e5926e0..9630139d 100644 --- a/src/libdbcppp/MessageImpl.cpp +++ b/src/libdbcppp/MessageImpl.cpp @@ -9,7 +9,7 @@ std::unique_ptr IMessage::Create( , uint64_t message_size , std::string&& transmitter , std::vector&& message_transmitters - , std::vector>&& signals + , std::vector>&& signals_ , std::vector>&& attribute_values , std::string&& comment , std::vector>&& signal_groups) @@ -17,7 +17,7 @@ std::unique_ptr IMessage::Create( std::vector ss; std::vector avs; std::vector sgs; - for (auto& s : signals) + for (auto& s : signals_) { ss.push_back(std::move(static_cast(*s))); s.reset(nullptr); @@ -49,7 +49,7 @@ MessageImpl::MessageImpl( , uint64_t message_size , std::string&& transmitter , std::vector&& message_transmitters - , std::vector&& signals + , std::vector&& signals_ , std::vector&& attribute_values , std::string&& comment , std::vector&& signal_groups) @@ -59,7 +59,7 @@ MessageImpl::MessageImpl( , _message_size(std::move(message_size)) , _transmitter(std::move(transmitter)) , _message_transmitters(std::move(message_transmitters)) - , _signals(std::move(signals)) + , _signals(std::move(signals_)) , _attribute_values(std::move(attribute_values)) , _comment(std::move(comment)) , _signal_groups(std::move(signal_groups)) diff --git a/src/libdbcppp/MessageImpl.h b/src/libdbcppp/MessageImpl.h index ff5abb61..04c50fb0 100644 --- a/src/libdbcppp/MessageImpl.h +++ b/src/libdbcppp/MessageImpl.h @@ -18,7 +18,7 @@ namespace dbcppp , uint64_t message_size , std::string&& transmitter , std::vector&& message_transmitters - , std::vector&& signals + , std::vector&& signals_ , std::vector&& attribute_values , std::string&& comment , std::vector&& signal_groups);