From 21ddef939ed56e481ba96c7ed81e59ccb03ecde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20B=C3=B6rschig?= Date: Fri, 26 Jun 2026 16:33:56 +0200 Subject: [PATCH] style: fix includes core/vasio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marius Börschig --- .../core/vasio/AggregationMessageTraits.hpp | 12 ++--- .../core/vasio/ConnectKnownParticipants.cpp | 10 ++-- .../core/vasio/ConnectKnownParticipants.hpp | 12 ++--- SilKit/source/core/vasio/ConnectPeer.cpp | 12 ++--- SilKit/source/core/vasio/ConnectPeer.hpp | 6 +-- SilKit/source/core/vasio/IConnectPeer.hpp | 4 +- .../source/core/vasio/IConnectionMethods.hpp | 6 +-- SilKit/source/core/vasio/IPeerMetrics.hpp | 6 +-- SilKit/source/core/vasio/IVAsioPeer.hpp | 12 ++--- SilKit/source/core/vasio/PeerMetrics.cpp | 2 +- SilKit/source/core/vasio/PeerMetrics.hpp | 10 ++-- .../core/vasio/RemoteConnectionManager.cpp | 10 ++-- .../core/vasio/RemoteConnectionManager.hpp | 4 +- SilKit/source/core/vasio/RingBuffer.cpp | 2 +- SilKit/source/core/vasio/RingBuffer.hpp | 2 +- .../source/core/vasio/SerializedMessage.cpp | 2 +- .../source/core/vasio/SerializedMessage.hpp | 36 ++++++------- .../core/vasio/SerializedMessageTraits.hpp | 4 +- SilKit/source/core/vasio/SilKitLink.hpp | 12 ++--- .../vasio/Test_ConnectKnownParticipants.cpp | 20 +++---- SilKit/source/core/vasio/Test_ConnectPeer.cpp | 14 ++--- .../core/vasio/Test_ParticipantVersion.cpp | 8 +-- SilKit/source/core/vasio/Test_RingBuffer.cpp | 2 +- .../core/vasio/Test_SerializedMessage.cpp | 2 +- .../core/vasio/Test_TransformAcceptorUris.cpp | 2 +- .../core/vasio/Test_VAsioCapabilities.cpp | 2 +- .../core/vasio/Test_VAsioConnection.cpp | 44 +++++++-------- .../source/core/vasio/Test_VAsioRegistry.cpp | 6 +-- SilKit/source/core/vasio/Test_VAsioSerdes.cpp | 2 +- .../core/vasio/TransformAcceptorUris.cpp | 4 +- .../core/vasio/TransformAcceptorUris.hpp | 6 +-- .../source/core/vasio/VAsioCapabilities.cpp | 4 +- SilKit/source/core/vasio/VAsioConnection.cpp | 28 +++++----- SilKit/source/core/vasio/VAsioConnection.hpp | 54 +++++++++---------- SilKit/source/core/vasio/VAsioConstants.hpp | 2 +- SilKit/source/core/vasio/VAsioDatatypes.hpp | 4 +- SilKit/source/core/vasio/VAsioPeer.cpp | 14 ++--- SilKit/source/core/vasio/VAsioPeer.hpp | 24 ++++----- SilKit/source/core/vasio/VAsioPeerInfo.hpp | 2 +- .../core/vasio/VAsioProtocolVersion.hpp | 4 +- SilKit/source/core/vasio/VAsioProxyPeer.cpp | 4 +- SilKit/source/core/vasio/VAsioProxyPeer.hpp | 2 +- SilKit/source/core/vasio/VAsioReceiver.hpp | 12 ++--- SilKit/source/core/vasio/VAsioRegistry.cpp | 22 ++++---- SilKit/source/core/vasio/VAsioRegistry.hpp | 12 ++--- SilKit/source/core/vasio/VAsioSerdes.cpp | 14 ++--- SilKit/source/core/vasio/VAsioSerdes.hpp | 6 +-- .../core/vasio/VAsioSerdes_Protocol30.cpp | 2 +- .../core/vasio/VAsioSerdes_Protocol30.hpp | 2 +- SilKit/source/core/vasio/VAsioTransmitter.hpp | 14 ++--- SilKit/source/core/vasio/io/IAcceptor.hpp | 2 +- SilKit/source/core/vasio/io/IConnector.hpp | 2 +- SilKit/source/core/vasio/io/IIoContext.hpp | 8 +-- .../core/vasio/io/MakeAsioIoContext.cpp | 2 +- .../core/vasio/io/MakeAsioIoContext.hpp | 6 +-- .../core/vasio/io/Test_AsioIoContext.cpp | 2 +- .../source/core/vasio/io/Test_IoContext.cpp | 14 ++--- .../core/vasio/io/impl/AsioAcceptor.hpp | 24 ++++----- .../vasio/io/impl/AsioCleanupEndpoint.cpp | 2 +- .../core/vasio/io/impl/AsioConnector.hpp | 22 ++++---- .../core/vasio/io/impl/AsioFormatEndpoint.cpp | 4 +- .../io/impl/AsioGenericRawByteStream.cpp | 12 ++--- .../io/impl/AsioGenericRawByteStream.hpp | 8 +-- .../core/vasio/io/impl/AsioIoContext.cpp | 14 ++--- .../core/vasio/io/impl/AsioIoContext.hpp | 6 +-- .../source/core/vasio/io/impl/AsioTimer.cpp | 4 +- .../source/core/vasio/io/impl/AsioTimer.hpp | 2 +- .../vasio/io/impl/SetAsioSocketOptions.cpp | 4 +- .../vasio/io/impl/SetAsioSocketOptions.hpp | 4 +- .../core/vasio/io/mock/MockAcceptor.hpp | 2 +- .../core/vasio/io/mock/MockConnector.hpp | 2 +- .../core/vasio/io/mock/MockIoContext.hpp | 2 +- .../core/vasio/io/mock/MockRawByteStream.hpp | 2 +- .../source/core/vasio/io/mock/MockTimer.hpp | 2 +- .../io/util/Test_TracingMacrosDetails.cpp | 2 +- .../core/vasio/io/util/TracingMacros.hpp | 2 +- .../MockConnectKnownParticipantsListener.hpp | 2 +- .../core/vasio/mock/MockConnectPeer.hpp | 4 +- .../core/vasio/mock/MockConnectionMethods.hpp | 2 +- .../source/core/vasio/mock/MockVAsioPeer.hpp | 2 +- 80 files changed, 334 insertions(+), 334 deletions(-) diff --git a/SilKit/source/core/vasio/AggregationMessageTraits.hpp b/SilKit/source/core/vasio/AggregationMessageTraits.hpp index c3e33045f..86b98aaec 100644 --- a/SilKit/source/core/vasio/AggregationMessageTraits.hpp +++ b/SilKit/source/core/vasio/AggregationMessageTraits.hpp @@ -4,14 +4,14 @@ #pragma once -#include "VAsioDatatypes.hpp" +#include "core/vasio/VAsioDatatypes.hpp" -#include "OrchestrationDatatypes.hpp" +#include "core/internal/OrchestrationDatatypes.hpp" -#include "WireCanMessages.hpp" -#include "WireDataMessages.hpp" -#include "WireEthernetMessages.hpp" -#include "WireRpcMessages.hpp" +#include "wire/can/WireCanMessages.hpp" +#include "wire/pubsub/WireDataMessages.hpp" +#include "wire/ethernet/WireEthernetMessages.hpp" +#include "wire/rpc/WireRpcMessages.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/ConnectKnownParticipants.cpp b/SilKit/source/core/vasio/ConnectKnownParticipants.cpp index 64cb1291c..6ab28fb45 100644 --- a/SilKit/source/core/vasio/ConnectKnownParticipants.cpp +++ b/SilKit/source/core/vasio/ConnectKnownParticipants.cpp @@ -2,12 +2,12 @@ // // SPDX-License-Identifier: MIT -#include "ConnectKnownParticipants.hpp" +#include "core/vasio/ConnectKnownParticipants.hpp" -#include "LoggerMessage.hpp" -#include "VAsioConnection.hpp" -#include "VAsioPeer.hpp" -#include "util/TracingMacros.hpp" +#include "services/logging/LoggerMessage.hpp" +#include "core/vasio/VAsioConnection.hpp" +#include "core/vasio/VAsioPeer.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" #include #include diff --git a/SilKit/source/core/vasio/ConnectKnownParticipants.hpp b/SilKit/source/core/vasio/ConnectKnownParticipants.hpp index 1ec1e0f44..efa7f8bd3 100644 --- a/SilKit/source/core/vasio/ConnectKnownParticipants.hpp +++ b/SilKit/source/core/vasio/ConnectKnownParticipants.hpp @@ -5,12 +5,12 @@ #pragma once -#include "IIoContext.hpp" -#include "IConnectPeer.hpp" -#include "IConnectionMethods.hpp" -#include "IConnectKnownParticipantsListener.hpp" -#include "ITimer.hpp" -#include "VAsioPeerInfo.hpp" +#include "core/vasio/io/IIoContext.hpp" +#include "core/vasio/IConnectPeer.hpp" +#include "core/vasio/IConnectionMethods.hpp" +#include "core/vasio/IConnectKnownParticipantsListener.hpp" +#include "core/vasio/io/ITimer.hpp" +#include "core/vasio/VAsioPeerInfo.hpp" #include "silkit/services/logging/ILogger.hpp" diff --git a/SilKit/source/core/vasio/ConnectPeer.cpp b/SilKit/source/core/vasio/ConnectPeer.cpp index 36fc2a128..41ab37813 100644 --- a/SilKit/source/core/vasio/ConnectPeer.cpp +++ b/SilKit/source/core/vasio/ConnectPeer.cpp @@ -2,15 +2,15 @@ // // SPDX-License-Identifier: MIT -#include "ConnectPeer.hpp" +#include "core/vasio/ConnectPeer.hpp" -#include "util/TracingMacros.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" -#include "VAsioConnection.hpp" -#include "VAsioPeerInfo.hpp" -#include "VAsioPeer.hpp" +#include "core/vasio/VAsioConnection.hpp" +#include "core/vasio/VAsioPeerInfo.hpp" +#include "core/vasio/VAsioPeer.hpp" -#include "Uri.hpp" +#include "util/Uri.hpp" #include #include diff --git a/SilKit/source/core/vasio/ConnectPeer.hpp b/SilKit/source/core/vasio/ConnectPeer.hpp index 36bed196e..37a745144 100644 --- a/SilKit/source/core/vasio/ConnectPeer.hpp +++ b/SilKit/source/core/vasio/ConnectPeer.hpp @@ -5,11 +5,11 @@ #pragma once -#include "IConnectPeer.hpp" +#include "core/vasio/IConnectPeer.hpp" -#include "IIoContext.hpp" +#include "core/vasio/io/IIoContext.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include #include diff --git a/SilKit/source/core/vasio/IConnectPeer.hpp b/SilKit/source/core/vasio/IConnectPeer.hpp index a5248737f..ec514c17e 100644 --- a/SilKit/source/core/vasio/IConnectPeer.hpp +++ b/SilKit/source/core/vasio/IConnectPeer.hpp @@ -5,9 +5,9 @@ #pragma once -#include "VAsioPeerInfo.hpp" +#include "core/vasio/VAsioPeerInfo.hpp" -#include "IRawByteStream.hpp" +#include "core/vasio/io/IRawByteStream.hpp" #include #include diff --git a/SilKit/source/core/vasio/IConnectionMethods.hpp b/SilKit/source/core/vasio/IConnectionMethods.hpp index 827dad6bd..e7e006134 100644 --- a/SilKit/source/core/vasio/IConnectionMethods.hpp +++ b/SilKit/source/core/vasio/IConnectionMethods.hpp @@ -5,10 +5,10 @@ #pragma once -#include "VAsioPeerInfo.hpp" +#include "core/vasio/VAsioPeerInfo.hpp" -#include "IConnectPeer.hpp" -#include "IVAsioPeer.hpp" +#include "core/vasio/IConnectPeer.hpp" +#include "core/vasio/IVAsioPeer.hpp" #include #include diff --git a/SilKit/source/core/vasio/IPeerMetrics.hpp b/SilKit/source/core/vasio/IPeerMetrics.hpp index 290b24c48..10ce86bcb 100644 --- a/SilKit/source/core/vasio/IPeerMetrics.hpp +++ b/SilKit/source/core/vasio/IPeerMetrics.hpp @@ -5,9 +5,9 @@ #include -#include "IMetricsManager.hpp" -#include "IVAsioPeer.hpp" -#include "SerializedMessage.hpp" +#include "services/metrics/IMetricsManager.hpp" +#include "core/vasio/IVAsioPeer.hpp" +#include "core/vasio/SerializedMessage.hpp" namespace VSilKit { diff --git a/SilKit/source/core/vasio/IVAsioPeer.hpp b/SilKit/source/core/vasio/IVAsioPeer.hpp index c04527802..0a62de5ae 100644 --- a/SilKit/source/core/vasio/IVAsioPeer.hpp +++ b/SilKit/source/core/vasio/IVAsioPeer.hpp @@ -6,14 +6,14 @@ #include -#include "IServiceEndpoint.hpp" +#include "core/internal/IServiceEndpoint.hpp" -#include "VAsioPeerInfo.hpp" -#include "VAsioDatatypes.hpp" -#include "VAsioProtocolVersion.hpp" +#include "core/vasio/VAsioPeerInfo.hpp" +#include "core/vasio/VAsioDatatypes.hpp" +#include "core/vasio/VAsioProtocolVersion.hpp" -#include "SerializedMessage.hpp" -#include "IMetricsManager.hpp" +#include "core/vasio/SerializedMessage.hpp" +#include "services/metrics/IMetricsManager.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/PeerMetrics.cpp b/SilKit/source/core/vasio/PeerMetrics.cpp index d36066be1..2c3b1eb63 100644 --- a/SilKit/source/core/vasio/PeerMetrics.cpp +++ b/SilKit/source/core/vasio/PeerMetrics.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2025 Vector Informatik GmbH // SPDX-License-Identifier: MIT -#include "PeerMetrics.hpp" +#include "core/vasio/PeerMetrics.hpp" namespace VSilKit { diff --git a/SilKit/source/core/vasio/PeerMetrics.hpp b/SilKit/source/core/vasio/PeerMetrics.hpp index 4dbf9fec0..798822633 100644 --- a/SilKit/source/core/vasio/PeerMetrics.hpp +++ b/SilKit/source/core/vasio/PeerMetrics.hpp @@ -3,11 +3,11 @@ #pragma once -#include "IPeerMetrics.hpp" -#include "ICounterMetric.hpp" -#include "IStatisticMetric.hpp" -#include "IVAsioPeer.hpp" -#include "SerializedMessage.hpp" +#include "core/vasio/IPeerMetrics.hpp" +#include "services/metrics/ICounterMetric.hpp" +#include "services/metrics/IStatisticMetric.hpp" +#include "core/vasio/IVAsioPeer.hpp" +#include "core/vasio/SerializedMessage.hpp" namespace VSilKit { diff --git a/SilKit/source/core/vasio/RemoteConnectionManager.cpp b/SilKit/source/core/vasio/RemoteConnectionManager.cpp index 38a9044ef..99471ad0e 100644 --- a/SilKit/source/core/vasio/RemoteConnectionManager.cpp +++ b/SilKit/source/core/vasio/RemoteConnectionManager.cpp @@ -2,12 +2,12 @@ // // SPDX-License-Identifier: MIT -#include "RemoteConnectionManager.hpp" +#include "core/vasio/RemoteConnectionManager.hpp" -#include "VAsioConnection.hpp" -#include "VAsioPeer.hpp" -#include "ConnectPeer.hpp" -#include "util/TracingMacros.hpp" +#include "core/vasio/VAsioConnection.hpp" +#include "core/vasio/VAsioPeer.hpp" +#include "core/vasio/ConnectPeer.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" #if SILKIT_ENABLE_TRACING_INSTRUMENTATION_VAsioConnection diff --git a/SilKit/source/core/vasio/RemoteConnectionManager.hpp b/SilKit/source/core/vasio/RemoteConnectionManager.hpp index f834c3594..2843c3bf6 100644 --- a/SilKit/source/core/vasio/RemoteConnectionManager.hpp +++ b/SilKit/source/core/vasio/RemoteConnectionManager.hpp @@ -5,8 +5,8 @@ #pragma once -#include "ConnectPeer.hpp" -#include "ITimer.hpp" +#include "core/vasio/ConnectPeer.hpp" +#include "core/vasio/io/ITimer.hpp" #include #include diff --git a/SilKit/source/core/vasio/RingBuffer.cpp b/SilKit/source/core/vasio/RingBuffer.cpp index 74c8f78aa..2178756ae 100644 --- a/SilKit/source/core/vasio/RingBuffer.cpp +++ b/SilKit/source/core/vasio/RingBuffer.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "RingBuffer.hpp" +#include "core/vasio/RingBuffer.hpp" #include #include diff --git a/SilKit/source/core/vasio/RingBuffer.hpp b/SilKit/source/core/vasio/RingBuffer.hpp index 630cd06dc..da75d4c01 100644 --- a/SilKit/source/core/vasio/RingBuffer.hpp +++ b/SilKit/source/core/vasio/RingBuffer.hpp @@ -7,7 +7,7 @@ #include #include -#include "util/Buffer.hpp" +#include "core/vasio/io/util/Buffer.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/SerializedMessage.cpp b/SilKit/source/core/vasio/SerializedMessage.cpp index 24a813f7b..88ccbbc05 100644 --- a/SilKit/source/core/vasio/SerializedMessage.cpp +++ b/SilKit/source/core/vasio/SerializedMessage.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "SerializedMessage.hpp" +#include "core/vasio/SerializedMessage.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/SerializedMessage.hpp b/SilKit/source/core/vasio/SerializedMessage.hpp index c45521e1b..9383ef9cc 100644 --- a/SilKit/source/core/vasio/SerializedMessage.hpp +++ b/SilKit/source/core/vasio/SerializedMessage.hpp @@ -3,26 +3,26 @@ // SPDX-License-Identifier: MIT #pragma once -#include "VAsioMsgKind.hpp" -#include "VAsioDatatypes.hpp" -#include "SerializedMessageTraits.hpp" -#include "AggregationMessageTraits.hpp" -#include "MessageBuffer.hpp" +#include "core/vasio/VAsioMsgKind.hpp" +#include "core/vasio/VAsioDatatypes.hpp" +#include "core/vasio/SerializedMessageTraits.hpp" +#include "core/vasio/AggregationMessageTraits.hpp" +#include "core/internal/MessageBuffer.hpp" // Component specific Serialize/Deserialize functions -#include "VAsioSerdes.hpp" -#include "CanSerdes.hpp" -#include "LinSerdes.hpp" -#include "EthernetSerdes.hpp" -#include "FlexraySerdes.hpp" -#include "RpcSerdes.hpp" -#include "InternalSerdes.hpp" -#include "SyncSerdes.hpp" -#include "ServiceSerdes.hpp" -#include "RequestReplySerdes.hpp" -#include "LoggingSerdes.hpp" -#include "DataSerdes.hpp" -#include "MetricsSerdes.hpp" +#include "core/vasio/VAsioSerdes.hpp" +#include "services/can/CanSerdes.hpp" +#include "services/lin/LinSerdes.hpp" +#include "services/ethernet/EthernetSerdes.hpp" +#include "services/flexray/FlexraySerdes.hpp" +#include "services/rpc/RpcSerdes.hpp" +#include "core/internal/InternalSerdes.hpp" +#include "services/orchestration/SyncSerdes.hpp" +#include "core/service/ServiceSerdes.hpp" +#include "core/requests/RequestReplySerdes.hpp" +#include "services/logging/LoggingSerdes.hpp" +#include "services/pubsub/DataSerdes.hpp" +#include "services/metrics/MetricsSerdes.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/SerializedMessageTraits.hpp b/SilKit/source/core/vasio/SerializedMessageTraits.hpp index bcd1f53e8..5591e4e46 100644 --- a/SilKit/source/core/vasio/SerializedMessageTraits.hpp +++ b/SilKit/source/core/vasio/SerializedMessageTraits.hpp @@ -3,8 +3,8 @@ // SPDX-License-Identifier: MIT #pragma once -#include "VAsioMsgKind.hpp" -#include "VAsioDatatypes.hpp" +#include "core/vasio/VAsioMsgKind.hpp" +#include "core/vasio/VAsioDatatypes.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/SilKitLink.hpp b/SilKit/source/core/vasio/SilKitLink.hpp index e442e7bfd..b77fc119d 100644 --- a/SilKit/source/core/vasio/SilKitLink.hpp +++ b/SilKit/source/core/vasio/SilKitLink.hpp @@ -4,14 +4,14 @@ #pragma once -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" -#include "VAsioTransmitter.hpp" -#include "traits/SilKitMsgTraits.hpp" -#include "MessageTracing.hpp" +#include "core/vasio/VAsioTransmitter.hpp" +#include "core/internal/traits/SilKitMsgTraits.hpp" +#include "services/logging/MessageTracing.hpp" -#include "IMessageReceiver.hpp" -#include "TimeSyncService.hpp" +#include "core/internal/IMessageReceiver.hpp" +#include "services/orchestration/TimeSyncService.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/Test_ConnectKnownParticipants.cpp b/SilKit/source/core/vasio/Test_ConnectKnownParticipants.cpp index 7c444a4f2..5dd250a84 100644 --- a/SilKit/source/core/vasio/Test_ConnectKnownParticipants.cpp +++ b/SilKit/source/core/vasio/Test_ConnectKnownParticipants.cpp @@ -2,19 +2,19 @@ // // SPDX-License-Identifier: MIT -#include "ConnectKnownParticipants.hpp" +#include "core/vasio/ConnectKnownParticipants.hpp" -#include "MockLogger.hpp" +#include "services/logging/MockLogger.hpp" -#include "MockConnectKnownParticipantsListener.hpp" -#include "MockConnectionMethods.hpp" -#include "MockConnectPeer.hpp" -#include "MockIoContext.hpp" -#include "MockRawByteStream.hpp" -#include "MockTimer.hpp" -#include "MockVAsioPeer.hpp" +#include "core/vasio/mock/MockConnectKnownParticipantsListener.hpp" +#include "core/vasio/mock/MockConnectionMethods.hpp" +#include "core/vasio/mock/MockConnectPeer.hpp" +#include "core/vasio/io/mock/MockIoContext.hpp" +#include "core/vasio/io/mock/MockRawByteStream.hpp" +#include "core/vasio/io/mock/MockTimer.hpp" +#include "core/vasio/mock/MockVAsioPeer.hpp" -#include "Hash.hpp" +#include "util/Hash.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/Test_ConnectPeer.cpp b/SilKit/source/core/vasio/Test_ConnectPeer.cpp index 323ef8f90..d57cef32b 100644 --- a/SilKit/source/core/vasio/Test_ConnectPeer.cpp +++ b/SilKit/source/core/vasio/Test_ConnectPeer.cpp @@ -2,16 +2,16 @@ // // SPDX-License-Identifier: MIT -#include "ConnectPeer.hpp" +#include "core/vasio/ConnectPeer.hpp" -#include "MockLogger.hpp" +#include "services/logging/MockLogger.hpp" -#include "MockConnector.hpp" -#include "MockConnectPeer.hpp" -#include "MockIoContext.hpp" -#include "MockRawByteStream.hpp" +#include "core/vasio/io/mock/MockConnector.hpp" +#include "core/vasio/mock/MockConnectPeer.hpp" +#include "core/vasio/io/mock/MockIoContext.hpp" +#include "core/vasio/io/mock/MockRawByteStream.hpp" -#include "Hash.hpp" +#include "util/Hash.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/Test_ParticipantVersion.cpp b/SilKit/source/core/vasio/Test_ParticipantVersion.cpp index 962062b4c..17bf430ed 100644 --- a/SilKit/source/core/vasio/Test_ParticipantVersion.cpp +++ b/SilKit/source/core/vasio/Test_ParticipantVersion.cpp @@ -10,10 +10,10 @@ #include "gtest/gtest.h" -#include "ProtocolVersion.hpp" -#include "VAsioConnection.hpp" -#include "VAsioRegistry.hpp" -#include "Participant.hpp" +#include "core/internal/ProtocolVersion.hpp" +#include "core/vasio/VAsioConnection.hpp" +#include "core/vasio/VAsioRegistry.hpp" +#include "core/participant/Participant.hpp" #include "SimSystemController.hpp" diff --git a/SilKit/source/core/vasio/Test_RingBuffer.cpp b/SilKit/source/core/vasio/Test_RingBuffer.cpp index ac1b6a7a7..20abfcedf 100644 --- a/SilKit/source/core/vasio/Test_RingBuffer.cpp +++ b/SilKit/source/core/vasio/Test_RingBuffer.cpp @@ -5,7 +5,7 @@ #include #include -#include "RingBuffer.hpp" +#include "core/vasio/RingBuffer.hpp" #include "gtest/gtest.h" diff --git a/SilKit/source/core/vasio/Test_SerializedMessage.cpp b/SilKit/source/core/vasio/Test_SerializedMessage.cpp index b2e31472e..2fc6ed0db 100644 --- a/SilKit/source/core/vasio/Test_SerializedMessage.cpp +++ b/SilKit/source/core/vasio/Test_SerializedMessage.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "SerializedMessage.hpp" +#include "core/vasio/SerializedMessage.hpp" #include #include diff --git a/SilKit/source/core/vasio/Test_TransformAcceptorUris.cpp b/SilKit/source/core/vasio/Test_TransformAcceptorUris.cpp index d3c7ac249..fb04240c4 100644 --- a/SilKit/source/core/vasio/Test_TransformAcceptorUris.cpp +++ b/SilKit/source/core/vasio/Test_TransformAcceptorUris.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "TransformAcceptorUris.hpp" +#include "core/vasio/TransformAcceptorUris.hpp" #include "silkit/participant/exception.hpp" diff --git a/SilKit/source/core/vasio/Test_VAsioCapabilities.cpp b/SilKit/source/core/vasio/Test_VAsioCapabilities.cpp index b7a0e87fb..fa0e40e80 100644 --- a/SilKit/source/core/vasio/Test_VAsioCapabilities.cpp +++ b/SilKit/source/core/vasio/Test_VAsioCapabilities.cpp @@ -6,7 +6,7 @@ #include "silkit/participant/exception.hpp" -#include "VAsioCapabilities.hpp" +#include "core/vasio/VAsioCapabilities.hpp" namespace { diff --git a/SilKit/source/core/vasio/Test_VAsioConnection.cpp b/SilKit/source/core/vasio/Test_VAsioConnection.cpp index d86e1eb88..7819dcfde 100644 --- a/SilKit/source/core/vasio/Test_VAsioConnection.cpp +++ b/SilKit/source/core/vasio/Test_VAsioConnection.cpp @@ -13,36 +13,36 @@ #include "silkit/services/logging/fwd_decl.hpp" // internal types required for TestDataTypes because of SilKitMsgTraits -#include "WireCanMessages.hpp" -#include "WireDataMessages.hpp" -#include "WireEthernetMessages.hpp" -#include "WireFlexrayMessages.hpp" -#include "WireLinMessages.hpp" -#include "WireRpcMessages.hpp" +#include "wire/can/WireCanMessages.hpp" +#include "wire/pubsub/WireDataMessages.hpp" +#include "wire/ethernet/WireEthernetMessages.hpp" +#include "wire/flexray/WireFlexrayMessages.hpp" +#include "wire/lin/WireLinMessages.hpp" +#include "wire/rpc/WireRpcMessages.hpp" -#include "ServiceDatatypes.hpp" //concrete, no forwards -#include "RequestReplyDatatypes.hpp" //concrete, no forwards -#include "LoggingDatatypesInternal.hpp" //concrete, no forwards -#include "OrchestrationDatatypes.hpp" //concrete, no forwards +#include "core/service/ServiceDatatypes.hpp" //concrete, no forwards +#include "core/requests/RequestReplyDatatypes.hpp" //concrete, no forwards +#include "core/internal/LoggingDatatypesInternal.hpp" //concrete, no forwards +#include "core/internal/OrchestrationDatatypes.hpp" //concrete, no forwards -#include "ProtocolVersion.hpp" -#include "TestDataTypes.hpp" // must be included before VAsioConnection +#include "core/internal/ProtocolVersion.hpp" +#include "core/internal/TestDataTypes.hpp" // must be included before VAsioConnection -#include "IVAsioPeer.hpp" -#include "IMessageReceiver.hpp" +#include "core/vasio/IVAsioPeer.hpp" +#include "core/internal/IMessageReceiver.hpp" -#include "VAsioConnection.hpp" -#include "VAsioConstants.hpp" -#include "MockParticipant.hpp" // for DummyLogger -#include "VAsioSerdes.hpp" -#include "SerializedMessage.hpp" -#include "TimeProvider.hpp" +#include "core/vasio/VAsioConnection.hpp" +#include "core/vasio/VAsioConstants.hpp" +#include "core/mock/participant/MockParticipant.hpp" // for DummyLogger +#include "core/vasio/VAsioSerdes.hpp" +#include "core/vasio/SerializedMessage.hpp" +#include "services/orchestration/TimeProvider.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include -#include "MockVAsioPeer.hpp" +#include "core/vasio/mock/MockVAsioPeer.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/Test_VAsioRegistry.cpp b/SilKit/source/core/vasio/Test_VAsioRegistry.cpp index 381e7ee9f..eec26d461 100644 --- a/SilKit/source/core/vasio/Test_VAsioRegistry.cpp +++ b/SilKit/source/core/vasio/Test_VAsioRegistry.cpp @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: MIT -#include "ConfigurationTestUtils.hpp" +#include "config/ConfigurationTestUtils.hpp" -#include "Uri.hpp" +#include "util/Uri.hpp" -#include "VAsioRegistry.hpp" +#include "core/vasio/VAsioRegistry.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/Test_VAsioSerdes.cpp b/SilKit/source/core/vasio/Test_VAsioSerdes.cpp index 0312572ea..652826f11 100644 --- a/SilKit/source/core/vasio/Test_VAsioSerdes.cpp +++ b/SilKit/source/core/vasio/Test_VAsioSerdes.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "VAsioSerdes.hpp" +#include "core/vasio/VAsioSerdes.hpp" #include diff --git a/SilKit/source/core/vasio/TransformAcceptorUris.cpp b/SilKit/source/core/vasio/TransformAcceptorUris.cpp index cc281f9c5..2ac3275f3 100644 --- a/SilKit/source/core/vasio/TransformAcceptorUris.cpp +++ b/SilKit/source/core/vasio/TransformAcceptorUris.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MIT -#include "TransformAcceptorUris.hpp" +#include "core/vasio/TransformAcceptorUris.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include diff --git a/SilKit/source/core/vasio/TransformAcceptorUris.hpp b/SilKit/source/core/vasio/TransformAcceptorUris.hpp index d2dc8f6c9..e60c21d62 100644 --- a/SilKit/source/core/vasio/TransformAcceptorUris.hpp +++ b/SilKit/source/core/vasio/TransformAcceptorUris.hpp @@ -5,9 +5,9 @@ #pragma once -#include "LoggerMessage.hpp" -#include "IVAsioPeer.hpp" -#include "Uri.hpp" +#include "services/logging/LoggerMessage.hpp" +#include "core/vasio/IVAsioPeer.hpp" +#include "util/Uri.hpp" #include #include diff --git a/SilKit/source/core/vasio/VAsioCapabilities.cpp b/SilKit/source/core/vasio/VAsioCapabilities.cpp index 8ed2d53ca..39906da0e 100644 --- a/SilKit/source/core/vasio/VAsioCapabilities.cpp +++ b/SilKit/source/core/vasio/VAsioCapabilities.cpp @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: MIT -#include "VAsioCapabilities.hpp" +#include "core/vasio/VAsioCapabilities.hpp" #include "silkit/participant/exception.hpp" -#include "YamlParser.hpp" +#include "config/YamlParser.hpp" #include #include diff --git a/SilKit/source/core/vasio/VAsioConnection.cpp b/SilKit/source/core/vasio/VAsioConnection.cpp index af60e61c5..5667ba64f 100644 --- a/SilKit/source/core/vasio/VAsioConnection.cpp +++ b/SilKit/source/core/vasio/VAsioConnection.cpp @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: MIT -#include "VAsioConnection.hpp" -#include "VAsioProtocolVersion.hpp" +#include "core/vasio/VAsioConnection.hpp" +#include "core/vasio/VAsioProtocolVersion.hpp" -#include "SerializedMessage.hpp" +#include "core/vasio/SerializedMessage.hpp" #include #include @@ -16,19 +16,19 @@ #include #include -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" -#include "VAsioConstants.hpp" -#include "VAsioPeer.hpp" -#include "VAsioProxyPeer.hpp" -#include "SetThreadName.hpp" -#include "Uri.hpp" -#include "Assert.hpp" -#include "TransformAcceptorUris.hpp" -#include "StringHelpers.hpp" +#include "core/vasio/VAsioConstants.hpp" +#include "core/vasio/VAsioPeer.hpp" +#include "core/vasio/VAsioProxyPeer.hpp" +#include "util/SetThreadName.hpp" +#include "util/Uri.hpp" +#include "util/Assert.hpp" +#include "core/vasio/TransformAcceptorUris.hpp" +#include "util/StringHelpers.hpp" -#include "ConnectPeer.hpp" -#include "util/TracingMacros.hpp" +#include "core/vasio/ConnectPeer.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" #include "asio.hpp" diff --git a/SilKit/source/core/vasio/VAsioConnection.hpp b/SilKit/source/core/vasio/VAsioConnection.hpp index 4f2f5a357..c6eb8dee6 100644 --- a/SilKit/source/core/vasio/VAsioConnection.hpp +++ b/SilKit/source/core/vasio/VAsioConnection.hpp @@ -17,41 +17,41 @@ #include #include -#include "ParticipantConfiguration.hpp" +#include "config/ParticipantConfiguration.hpp" -#include "tuple_tools/for_each.hpp" -#include "tuple_tools/wrapped_tuple.hpp" +#include "util/tuple_tools/for_each.hpp" +#include "util/tuple_tools/wrapped_tuple.hpp" -#include "SilKitLink.hpp" -#include "IVAsioPeer.hpp" -#include "VAsioReceiver.hpp" -#include "VAsioTransmitter.hpp" -#include "VAsioMsgKind.hpp" -#include "IServiceEndpoint.hpp" -#include "traits/SilKitMsgTraits.hpp" -#include "traits/SilKitServiceTraits.hpp" +#include "core/vasio/SilKitLink.hpp" +#include "core/vasio/IVAsioPeer.hpp" +#include "core/vasio/VAsioReceiver.hpp" +#include "core/vasio/VAsioTransmitter.hpp" +#include "core/vasio/VAsioMsgKind.hpp" +#include "core/internal/IServiceEndpoint.hpp" +#include "core/internal/traits/SilKitMsgTraits.hpp" +#include "core/internal/traits/SilKitServiceTraits.hpp" // private data types for unit testing support: -#include "TestDataTraits.hpp" +#include "core/internal/TestDataTraits.hpp" #include "silkit/services/orchestration/string_utils.hpp" #include "silkit/services/can/string_utils.hpp" -#include "ProtocolVersion.hpp" -#include "SerializedMessage.hpp" -#include "Assert.hpp" -#include "LoggerMessage.hpp" -#include "VAsioCapabilities.hpp" -#include "WireLinMessages.hpp" -#include "Uri.hpp" -#include "Metrics.hpp" - -#include "IIoContext.hpp" -#include "IConnectionMethods.hpp" -#include "IConnectPeer.hpp" -#include "MakeAsioIoContext.hpp" -#include "ConnectKnownParticipants.hpp" -#include "RemoteConnectionManager.hpp" +#include "core/internal/ProtocolVersion.hpp" +#include "core/vasio/SerializedMessage.hpp" +#include "util/Assert.hpp" +#include "services/logging/LoggerMessage.hpp" +#include "core/vasio/VAsioCapabilities.hpp" +#include "wire/lin/WireLinMessages.hpp" +#include "util/Uri.hpp" +#include "services/metrics/Metrics.hpp" + +#include "core/vasio/io/IIoContext.hpp" +#include "core/vasio/IConnectionMethods.hpp" +#include "core/vasio/IConnectPeer.hpp" +#include "core/vasio/io/MakeAsioIoContext.hpp" +#include "core/vasio/ConnectKnownParticipants.hpp" +#include "core/vasio/RemoteConnectionManager.hpp" namespace SilKit { diff --git a/SilKit/source/core/vasio/VAsioConstants.hpp b/SilKit/source/core/vasio/VAsioConstants.hpp index 1ceaae5e2..1c9f2bdc7 100644 --- a/SilKit/source/core/vasio/VAsioConstants.hpp +++ b/SilKit/source/core/vasio/VAsioConstants.hpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT -#include "EndpointAddress.hpp" +#include "core/internal/EndpointAddress.hpp" namespace VSilKit { diff --git a/SilKit/source/core/vasio/VAsioDatatypes.hpp b/SilKit/source/core/vasio/VAsioDatatypes.hpp index c45e6c651..bcaeaf8dc 100644 --- a/SilKit/source/core/vasio/VAsioDatatypes.hpp +++ b/SilKit/source/core/vasio/VAsioDatatypes.hpp @@ -9,8 +9,8 @@ #include #include -#include "VAsioPeerInfo.hpp" -#include "ProtocolVersion.hpp" // for current ProtocolVersion in RegistryMsgHeader +#include "core/vasio/VAsioPeerInfo.hpp" +#include "core/internal/ProtocolVersion.hpp" // for current ProtocolVersion in RegistryMsgHeader namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioPeer.cpp b/SilKit/source/core/vasio/VAsioPeer.cpp index 65332786e..5f4b3d5c9 100644 --- a/SilKit/source/core/vasio/VAsioPeer.cpp +++ b/SilKit/source/core/vasio/VAsioPeer.cpp @@ -2,19 +2,19 @@ // // SPDX-License-Identifier: MIT -#include "VAsioPeer.hpp" +#include "core/vasio/VAsioPeer.hpp" #include #include #include -#include "LoggerMessage.hpp" -#include "VAsioMsgKind.hpp" -#include "VAsioConnection.hpp" -#include "Uri.hpp" -#include "Assert.hpp" +#include "services/logging/LoggerMessage.hpp" +#include "core/vasio/VAsioMsgKind.hpp" +#include "core/vasio/VAsioConnection.hpp" +#include "util/Uri.hpp" +#include "util/Assert.hpp" -#include "util/TracingMacros.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" #if SILKIT_ENABLE_TRACING_INSTRUMENTATION_VAsioPeer diff --git a/SilKit/source/core/vasio/VAsioPeer.hpp b/SilKit/source/core/vasio/VAsioPeer.hpp index 4c9ec6f31..70b9dd320 100644 --- a/SilKit/source/core/vasio/VAsioPeer.hpp +++ b/SilKit/source/core/vasio/VAsioPeer.hpp @@ -12,18 +12,18 @@ #include "silkit/services/logging/ILogger.hpp" -#include "IVAsioPeer.hpp" -#include "EndpointAddress.hpp" -#include "MessageBuffer.hpp" -#include "RingBuffer.hpp" -#include "VAsioPeerInfo.hpp" -#include "ProtocolVersion.hpp" - -#include "IIoContext.hpp" -#include "IRawByteStream.hpp" -#include "ITimer.hpp" - -#include "PeerMetrics.hpp" +#include "core/vasio/IVAsioPeer.hpp" +#include "core/internal/EndpointAddress.hpp" +#include "core/internal/MessageBuffer.hpp" +#include "core/vasio/RingBuffer.hpp" +#include "core/vasio/VAsioPeerInfo.hpp" +#include "core/internal/ProtocolVersion.hpp" + +#include "core/vasio/io/IIoContext.hpp" +#include "core/vasio/io/IRawByteStream.hpp" +#include "core/vasio/io/ITimer.hpp" + +#include "core/vasio/PeerMetrics.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioPeerInfo.hpp b/SilKit/source/core/vasio/VAsioPeerInfo.hpp index 50189e519..e326012a6 100755 --- a/SilKit/source/core/vasio/VAsioPeerInfo.hpp +++ b/SilKit/source/core/vasio/VAsioPeerInfo.hpp @@ -8,7 +8,7 @@ #include #include -#include "EndpointAddress.hpp" +#include "core/internal/EndpointAddress.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioProtocolVersion.hpp b/SilKit/source/core/vasio/VAsioProtocolVersion.hpp index 4b695899a..be5049fe3 100644 --- a/SilKit/source/core/vasio/VAsioProtocolVersion.hpp +++ b/SilKit/source/core/vasio/VAsioProtocolVersion.hpp @@ -9,8 +9,8 @@ #include #include -#include "VAsioDatatypes.hpp" //for RegistryMsgHeader -#include "MessageBuffer.hpp" //for ProtocolVersion +#include "core/vasio/VAsioDatatypes.hpp" //for RegistryMsgHeader +#include "core/internal/MessageBuffer.hpp" //for ProtocolVersion namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioProxyPeer.cpp b/SilKit/source/core/vasio/VAsioProxyPeer.cpp index 5857278bf..f33b8b411 100644 --- a/SilKit/source/core/vasio/VAsioProxyPeer.cpp +++ b/SilKit/source/core/vasio/VAsioProxyPeer.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MIT -#include "VAsioProxyPeer.hpp" +#include "core/vasio/VAsioProxyPeer.hpp" -#include "Logger.hpp" +#include "services/logging/Logger.hpp" namespace { diff --git a/SilKit/source/core/vasio/VAsioProxyPeer.hpp b/SilKit/source/core/vasio/VAsioProxyPeer.hpp index 58956aec8..7af5e736d 100644 --- a/SilKit/source/core/vasio/VAsioProxyPeer.hpp +++ b/SilKit/source/core/vasio/VAsioProxyPeer.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IVAsioPeer.hpp" +#include "core/vasio/IVAsioPeer.hpp" namespace SilKit { diff --git a/SilKit/source/core/vasio/VAsioReceiver.hpp b/SilKit/source/core/vasio/VAsioReceiver.hpp index 11a6c5e1e..f6b981cd1 100644 --- a/SilKit/source/core/vasio/VAsioReceiver.hpp +++ b/SilKit/source/core/vasio/VAsioReceiver.hpp @@ -4,14 +4,14 @@ #pragma once -#include "SilKitLink.hpp" +#include "core/vasio/SilKitLink.hpp" -#include "VAsioDatatypes.hpp" +#include "core/vasio/VAsioDatatypes.hpp" -#include "MessageTracing.hpp" -#include "IServiceEndpoint.hpp" -#include "SerializedMessage.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/MessageTracing.hpp" +#include "core/internal/IServiceEndpoint.hpp" +#include "core/vasio/SerializedMessage.hpp" +#include "services/logging/LoggerMessage.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioRegistry.cpp b/SilKit/source/core/vasio/VAsioRegistry.cpp index 25b0b48cc..6f8826ad3 100644 --- a/SilKit/source/core/vasio/VAsioRegistry.cpp +++ b/SilKit/source/core/vasio/VAsioRegistry.cpp @@ -2,20 +2,20 @@ // // SPDX-License-Identifier: MIT -#include "VAsioRegistry.hpp" +#include "core/vasio/VAsioRegistry.hpp" -#include "Logger.hpp" -#include "Uri.hpp" -#include "LoggerMessage.hpp" -#include "TransformAcceptorUris.hpp" -#include "VAsioConstants.hpp" +#include "services/logging/Logger.hpp" +#include "util/Uri.hpp" +#include "services/logging/LoggerMessage.hpp" +#include "core/vasio/TransformAcceptorUris.hpp" +#include "core/vasio/VAsioConstants.hpp" -#include "MetricsReceiver.hpp" -#include "MetricsProcessor.hpp" -#include "MetricsManager.hpp" -#include "CreateMetricsSinksFromParticipantConfiguration.hpp" +#include "services/metrics/MetricsReceiver.hpp" +#include "services/metrics/MetricsProcessor.hpp" +#include "services/metrics/MetricsManager.hpp" +#include "services/metrics/CreateMetricsSinksFromParticipantConfiguration.hpp" -#include "traits/SilKitServiceConfigTraits.hpp" +#include "core/internal/traits/SilKitServiceConfigTraits.hpp" namespace Log = SilKit::Services::Logging; diff --git a/SilKit/source/core/vasio/VAsioRegistry.hpp b/SilKit/source/core/vasio/VAsioRegistry.hpp index 50befd19c..648805c7f 100644 --- a/SilKit/source/core/vasio/VAsioRegistry.hpp +++ b/SilKit/source/core/vasio/VAsioRegistry.hpp @@ -6,16 +6,16 @@ #include -#include "ILoggerInternal.hpp" +#include "services/logging/ILoggerInternal.hpp" #include "silkit/vendor/ISilKitRegistry.hpp" #include "silkit/services/orchestration/OrchestrationDatatypes.hpp" -#include "VAsioConnection.hpp" -#include "ParticipantConfiguration.hpp" -#include "ProtocolVersion.hpp" -#include "TimeProvider.hpp" +#include "core/vasio/VAsioConnection.hpp" +#include "config/ParticipantConfiguration.hpp" +#include "core/internal/ProtocolVersion.hpp" +#include "services/orchestration/TimeProvider.hpp" -#include "MetricsReceiver.hpp" +#include "services/metrics/MetricsReceiver.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioSerdes.cpp b/SilKit/source/core/vasio/VAsioSerdes.cpp index 475d742c9..6ecf2cf49 100644 --- a/SilKit/source/core/vasio/VAsioSerdes.cpp +++ b/SilKit/source/core/vasio/VAsioSerdes.cpp @@ -2,16 +2,16 @@ // // SPDX-License-Identifier: MIT -#include "VAsioSerdes.hpp" -#include "VAsioPeerInfo.hpp" +#include "core/vasio/VAsioSerdes.hpp" +#include "core/vasio/VAsioPeerInfo.hpp" -#include "Uri.hpp" -#include "InternalSerdes.hpp" -#include "ProtocolVersion.hpp" -#include "VAsioProtocolVersion.hpp" // from_header(ProtcolVersion) +#include "util/Uri.hpp" +#include "core/internal/InternalSerdes.hpp" +#include "core/internal/ProtocolVersion.hpp" +#include "core/vasio/VAsioProtocolVersion.hpp" // from_header(ProtcolVersion) // Backward compatibility: -#include "VAsioSerdes_Protocol30.hpp" +#include "core/vasio/VAsioSerdes_Protocol30.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioSerdes.hpp b/SilKit/source/core/vasio/VAsioSerdes.hpp index 8aec70226..fba4d0aae 100644 --- a/SilKit/source/core/vasio/VAsioSerdes.hpp +++ b/SilKit/source/core/vasio/VAsioSerdes.hpp @@ -4,9 +4,9 @@ #pragma once -#include "MessageBuffer.hpp" -#include "VAsioMsgKind.hpp" -#include "VAsioDatatypes.hpp" +#include "core/internal/MessageBuffer.hpp" +#include "core/vasio/VAsioMsgKind.hpp" +#include "core/vasio/VAsioDatatypes.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioSerdes_Protocol30.cpp b/SilKit/source/core/vasio/VAsioSerdes_Protocol30.cpp index 140872349..628990591 100644 --- a/SilKit/source/core/vasio/VAsioSerdes_Protocol30.cpp +++ b/SilKit/source/core/vasio/VAsioSerdes_Protocol30.cpp @@ -7,7 +7,7 @@ #include #include -#include "VAsioSerdes_Protocol30.hpp" +#include "core/vasio/VAsioSerdes_Protocol30.hpp" namespace protocol_3_0 { diff --git a/SilKit/source/core/vasio/VAsioSerdes_Protocol30.hpp b/SilKit/source/core/vasio/VAsioSerdes_Protocol30.hpp index a80ed7e0c..67adbebd8 100644 --- a/SilKit/source/core/vasio/VAsioSerdes_Protocol30.hpp +++ b/SilKit/source/core/vasio/VAsioSerdes_Protocol30.hpp @@ -4,7 +4,7 @@ #pragma once -#include "VAsioSerdes.hpp" +#include "core/vasio/VAsioSerdes.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/VAsioTransmitter.hpp b/SilKit/source/core/vasio/VAsioTransmitter.hpp index 68e47e30e..f26cb66b9 100644 --- a/SilKit/source/core/vasio/VAsioTransmitter.hpp +++ b/SilKit/source/core/vasio/VAsioTransmitter.hpp @@ -6,16 +6,16 @@ #include -#include "IVAsioPeer.hpp" +#include "core/vasio/IVAsioPeer.hpp" #include -#include "IMessageReceiver.hpp" -#include "IServiceEndpoint.hpp" -#include "traits/SilKitMsgTraits.hpp" -#include "ILoggerInternal.hpp" -#include "MessageTracing.hpp" +#include "core/internal/IMessageReceiver.hpp" +#include "core/internal/IServiceEndpoint.hpp" +#include "core/internal/traits/SilKitMsgTraits.hpp" +#include "services/logging/ILoggerInternal.hpp" +#include "services/logging/MessageTracing.hpp" -#include "SerializedMessage.hpp" +#include "core/vasio/SerializedMessage.hpp" namespace SilKit { namespace Core { diff --git a/SilKit/source/core/vasio/io/IAcceptor.hpp b/SilKit/source/core/vasio/io/IAcceptor.hpp index 869b4766d..5e4ff709c 100644 --- a/SilKit/source/core/vasio/io/IAcceptor.hpp +++ b/SilKit/source/core/vasio/io/IAcceptor.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IRawByteStream.hpp" +#include "core/vasio/io/IRawByteStream.hpp" #include #include diff --git a/SilKit/source/core/vasio/io/IConnector.hpp b/SilKit/source/core/vasio/io/IConnector.hpp index 5c0bca0e5..3983deef7 100644 --- a/SilKit/source/core/vasio/io/IConnector.hpp +++ b/SilKit/source/core/vasio/io/IConnector.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IRawByteStream.hpp" +#include "core/vasio/io/IRawByteStream.hpp" #include #include diff --git a/SilKit/source/core/vasio/io/IIoContext.hpp b/SilKit/source/core/vasio/io/IIoContext.hpp index 164dfd584..b9a42e947 100644 --- a/SilKit/source/core/vasio/io/IIoContext.hpp +++ b/SilKit/source/core/vasio/io/IIoContext.hpp @@ -5,11 +5,11 @@ #pragma once -#include "IAcceptor.hpp" -#include "IConnector.hpp" -#include "ITimer.hpp" +#include "core/vasio/io/IAcceptor.hpp" +#include "core/vasio/io/IConnector.hpp" +#include "core/vasio/io/ITimer.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include #include diff --git a/SilKit/source/core/vasio/io/MakeAsioIoContext.cpp b/SilKit/source/core/vasio/io/MakeAsioIoContext.cpp index 378d7d983..8788baa64 100644 --- a/SilKit/source/core/vasio/io/MakeAsioIoContext.cpp +++ b/SilKit/source/core/vasio/io/MakeAsioIoContext.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "MakeAsioIoContext.hpp" +#include "core/vasio/io/MakeAsioIoContext.hpp" #include "impl/AsioIoContext.hpp" diff --git a/SilKit/source/core/vasio/io/MakeAsioIoContext.hpp b/SilKit/source/core/vasio/io/MakeAsioIoContext.hpp index f020edd9e..ab67aa437 100644 --- a/SilKit/source/core/vasio/io/MakeAsioIoContext.hpp +++ b/SilKit/source/core/vasio/io/MakeAsioIoContext.hpp @@ -5,10 +5,10 @@ #pragma once -#include "IIoContext.hpp" -#include "AsioSocketOptions.hpp" +#include "core/vasio/io/IIoContext.hpp" +#include "core/vasio/io/AsioSocketOptions.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include diff --git a/SilKit/source/core/vasio/io/Test_AsioIoContext.cpp b/SilKit/source/core/vasio/io/Test_AsioIoContext.cpp index 8e52ef939..c048336c4 100644 --- a/SilKit/source/core/vasio/io/Test_AsioIoContext.cpp +++ b/SilKit/source/core/vasio/io/Test_AsioIoContext.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "MakeAsioIoContext.hpp" +#include "core/vasio/io/MakeAsioIoContext.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/io/Test_IoContext.cpp b/SilKit/source/core/vasio/io/Test_IoContext.cpp index 7085e579c..553b9d8a2 100644 --- a/SilKit/source/core/vasio/io/Test_IoContext.cpp +++ b/SilKit/source/core/vasio/io/Test_IoContext.cpp @@ -2,17 +2,17 @@ // // SPDX-License-Identifier: MIT -#include "Uri.hpp" +#include "util/Uri.hpp" #include "core/vasio/io/MakeAsioIoContext.hpp" #include -#include "Uuid.hpp" +#include "util/Uuid.hpp" -#include "MockLogger.hpp" +#include "services/logging/MockLogger.hpp" -#include "MockAcceptor.hpp" -#include "MockConnector.hpp" -#include "MockRawByteStream.hpp" -#include "MockTimer.hpp" +#include "core/vasio/io/mock/MockAcceptor.hpp" +#include "core/vasio/io/mock/MockConnector.hpp" +#include "core/vasio/io/mock/MockRawByteStream.hpp" +#include "core/vasio/io/mock/MockTimer.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/io/impl/AsioAcceptor.hpp b/SilKit/source/core/vasio/io/impl/AsioAcceptor.hpp index a1404f7ff..d975c529e 100644 --- a/SilKit/source/core/vasio/io/impl/AsioAcceptor.hpp +++ b/SilKit/source/core/vasio/io/impl/AsioAcceptor.hpp @@ -4,21 +4,21 @@ #pragma once -#include "IAcceptor.hpp" -#include "IIoContext.hpp" +#include "core/vasio/io/IAcceptor.hpp" +#include "core/vasio/io/IIoContext.hpp" -#include "AsioCleanupEndpoint.hpp" -#include "AsioGenericRawByteStream.hpp" -#include "AsioFormatEndpoint.hpp" -#include "SetAsioSocketOptions.hpp" +#include "core/vasio/io/impl/AsioCleanupEndpoint.hpp" +#include "core/vasio/io/impl/AsioGenericRawByteStream.hpp" +#include "core/vasio/io/impl/AsioFormatEndpoint.hpp" +#include "core/vasio/io/impl/SetAsioSocketOptions.hpp" -#include "AsioSocketOptions.hpp" -#include "util/Atomic.hpp" -#include "util/Exceptions.hpp" -#include "util/TracingMacros.hpp" +#include "core/vasio/io/AsioSocketOptions.hpp" +#include "core/vasio/io/util/Atomic.hpp" +#include "core/vasio/io/util/Exceptions.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" -#include "LoggerMessage.hpp" -#include "ILoggerInternal.hpp" +#include "services/logging/LoggerMessage.hpp" +#include "services/logging/ILoggerInternal.hpp" #include diff --git a/SilKit/source/core/vasio/io/impl/AsioCleanupEndpoint.cpp b/SilKit/source/core/vasio/io/impl/AsioCleanupEndpoint.cpp index 309dbd5f9..abb602999 100644 --- a/SilKit/source/core/vasio/io/impl/AsioCleanupEndpoint.cpp +++ b/SilKit/source/core/vasio/io/impl/AsioCleanupEndpoint.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "AsioCleanupEndpoint.hpp" +#include "core/vasio/io/impl/AsioCleanupEndpoint.hpp" #include diff --git a/SilKit/source/core/vasio/io/impl/AsioConnector.hpp b/SilKit/source/core/vasio/io/impl/AsioConnector.hpp index ce1897044..d507c4c80 100644 --- a/SilKit/source/core/vasio/io/impl/AsioConnector.hpp +++ b/SilKit/source/core/vasio/io/impl/AsioConnector.hpp @@ -4,20 +4,20 @@ #pragma once -#include "IConnector.hpp" -#include "IIoContext.hpp" +#include "core/vasio/io/IConnector.hpp" +#include "core/vasio/io/IIoContext.hpp" -#include "AsioCleanupEndpoint.hpp" -#include "AsioGenericRawByteStream.hpp" -#include "AsioFormatEndpoint.hpp" -#include "SetAsioSocketOptions.hpp" +#include "core/vasio/io/impl/AsioCleanupEndpoint.hpp" +#include "core/vasio/io/impl/AsioGenericRawByteStream.hpp" +#include "core/vasio/io/impl/AsioFormatEndpoint.hpp" +#include "core/vasio/io/impl/SetAsioSocketOptions.hpp" -#include "AsioSocketOptions.hpp" -#include "util/Atomic.hpp" -#include "util/Exceptions.hpp" -#include "util/TracingMacros.hpp" +#include "core/vasio/io/AsioSocketOptions.hpp" +#include "core/vasio/io/util/Atomic.hpp" +#include "core/vasio/io/util/Exceptions.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include #include diff --git a/SilKit/source/core/vasio/io/impl/AsioFormatEndpoint.cpp b/SilKit/source/core/vasio/io/impl/AsioFormatEndpoint.cpp index ad9e3c8b3..d874192b9 100644 --- a/SilKit/source/core/vasio/io/impl/AsioFormatEndpoint.cpp +++ b/SilKit/source/core/vasio/io/impl/AsioFormatEndpoint.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MIT -#include "AsioFormatEndpoint.hpp" +#include "core/vasio/io/impl/AsioFormatEndpoint.hpp" -#include "util/Exceptions.hpp" +#include "core/vasio/io/util/Exceptions.hpp" #include diff --git a/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.cpp b/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.cpp index e3d3a55ce..0a1e481f6 100644 --- a/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.cpp +++ b/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.cpp @@ -2,14 +2,14 @@ // // SPDX-License-Identifier: MIT -#include "AsioGenericRawByteStream.hpp" +#include "core/vasio/io/impl/AsioGenericRawByteStream.hpp" -#include "AsioFormatEndpoint.hpp" -#include "IIoContext.hpp" +#include "core/vasio/io/impl/AsioFormatEndpoint.hpp" +#include "core/vasio/io/IIoContext.hpp" -#include "util/Atomic.hpp" -#include "util/Exceptions.hpp" -#include "util/TracingMacros.hpp" +#include "core/vasio/io/util/Atomic.hpp" +#include "core/vasio/io/util/Exceptions.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" #include #include diff --git a/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.hpp b/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.hpp index 5c0e48461..3cf9673c2 100644 --- a/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.hpp +++ b/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.hpp @@ -5,12 +5,12 @@ #pragma once -#include "IRawByteStream.hpp" +#include "core/vasio/io/IRawByteStream.hpp" -#include "AsioSocketOptions.hpp" -#include "util/Atomic.hpp" +#include "core/vasio/io/AsioSocketOptions.hpp" +#include "core/vasio/io/util/Atomic.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include #include diff --git a/SilKit/source/core/vasio/io/impl/AsioIoContext.cpp b/SilKit/source/core/vasio/io/impl/AsioIoContext.cpp index 58e155966..818c06adf 100644 --- a/SilKit/source/core/vasio/io/impl/AsioIoContext.cpp +++ b/SilKit/source/core/vasio/io/impl/AsioIoContext.cpp @@ -2,15 +2,15 @@ // // SPDX-License-Identifier: MIT -#include "AsioIoContext.hpp" +#include "core/vasio/io/impl/AsioIoContext.hpp" -#include "AsioAcceptor.hpp" -#include "AsioConnector.hpp" -#include "AsioTimer.hpp" -#include "SetAsioSocketOptions.hpp" +#include "core/vasio/io/impl/AsioAcceptor.hpp" +#include "core/vasio/io/impl/AsioConnector.hpp" +#include "core/vasio/io/impl/AsioTimer.hpp" +#include "core/vasio/io/impl/SetAsioSocketOptions.hpp" -#include "util/Exceptions.hpp" -#include "util/TracingMacros.hpp" +#include "core/vasio/io/util/Exceptions.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" #include #include diff --git a/SilKit/source/core/vasio/io/impl/AsioIoContext.hpp b/SilKit/source/core/vasio/io/impl/AsioIoContext.hpp index fec287cd5..1f908325b 100644 --- a/SilKit/source/core/vasio/io/impl/AsioIoContext.hpp +++ b/SilKit/source/core/vasio/io/impl/AsioIoContext.hpp @@ -5,11 +5,11 @@ #pragma once -#include "IIoContext.hpp" +#include "core/vasio/io/IIoContext.hpp" -#include "MakeAsioIoContext.hpp" +#include "core/vasio/io/MakeAsioIoContext.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include "asio.hpp" diff --git a/SilKit/source/core/vasio/io/impl/AsioTimer.cpp b/SilKit/source/core/vasio/io/impl/AsioTimer.cpp index e0d444a8e..6fc3ba0d1 100644 --- a/SilKit/source/core/vasio/io/impl/AsioTimer.cpp +++ b/SilKit/source/core/vasio/io/impl/AsioTimer.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MIT -#include "AsioTimer.hpp" +#include "core/vasio/io/impl/AsioTimer.hpp" -#include "util/Exceptions.hpp" +#include "core/vasio/io/util/Exceptions.hpp" #include "silkit/SilKitMacros.hpp" diff --git a/SilKit/source/core/vasio/io/impl/AsioTimer.hpp b/SilKit/source/core/vasio/io/impl/AsioTimer.hpp index e328dbcae..a11b7c376 100644 --- a/SilKit/source/core/vasio/io/impl/AsioTimer.hpp +++ b/SilKit/source/core/vasio/io/impl/AsioTimer.hpp @@ -5,7 +5,7 @@ #pragma once -#include "ITimer.hpp" +#include "core/vasio/io/ITimer.hpp" #include "asio.hpp" diff --git a/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.cpp b/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.cpp index 64b75312c..ab7d09a91 100644 --- a/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.cpp +++ b/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MIT -#include "SetAsioSocketOptions.hpp" +#include "core/vasio/io/impl/SetAsioSocketOptions.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" namespace { diff --git a/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.hpp b/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.hpp index 07adecd06..0f62fe285 100644 --- a/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.hpp +++ b/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.hpp @@ -5,9 +5,9 @@ #pragma once -#include "AsioSocketOptions.hpp" +#include "core/vasio/io/AsioSocketOptions.hpp" -#include "ILoggerInternal.hpp" +#include "services/logging/ILoggerInternal.hpp" #include "asio.hpp" diff --git a/SilKit/source/core/vasio/io/mock/MockAcceptor.hpp b/SilKit/source/core/vasio/io/mock/MockAcceptor.hpp index 9916d6d38..77083cade 100644 --- a/SilKit/source/core/vasio/io/mock/MockAcceptor.hpp +++ b/SilKit/source/core/vasio/io/mock/MockAcceptor.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IAcceptor.hpp" +#include "core/vasio/io/IAcceptor.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/io/mock/MockConnector.hpp b/SilKit/source/core/vasio/io/mock/MockConnector.hpp index 4c5434b8b..de7d58318 100644 --- a/SilKit/source/core/vasio/io/mock/MockConnector.hpp +++ b/SilKit/source/core/vasio/io/mock/MockConnector.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IConnector.hpp" +#include "core/vasio/io/IConnector.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/io/mock/MockIoContext.hpp b/SilKit/source/core/vasio/io/mock/MockIoContext.hpp index 03f0b4602..610d10446 100644 --- a/SilKit/source/core/vasio/io/mock/MockIoContext.hpp +++ b/SilKit/source/core/vasio/io/mock/MockIoContext.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IIoContext.hpp" +#include "core/vasio/io/IIoContext.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/io/mock/MockRawByteStream.hpp b/SilKit/source/core/vasio/io/mock/MockRawByteStream.hpp index aa6991d96..d35030ee1 100644 --- a/SilKit/source/core/vasio/io/mock/MockRawByteStream.hpp +++ b/SilKit/source/core/vasio/io/mock/MockRawByteStream.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IRawByteStream.hpp" +#include "core/vasio/io/IRawByteStream.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/io/mock/MockTimer.hpp b/SilKit/source/core/vasio/io/mock/MockTimer.hpp index 90a4616f1..8fc52921f 100644 --- a/SilKit/source/core/vasio/io/mock/MockTimer.hpp +++ b/SilKit/source/core/vasio/io/mock/MockTimer.hpp @@ -5,7 +5,7 @@ #pragma once -#include "ITimer.hpp" +#include "core/vasio/io/ITimer.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/io/util/Test_TracingMacrosDetails.cpp b/SilKit/source/core/vasio/io/util/Test_TracingMacrosDetails.cpp index f32c8a0e3..6ad4b2523 100644 --- a/SilKit/source/core/vasio/io/util/Test_TracingMacrosDetails.cpp +++ b/SilKit/source/core/vasio/io/util/Test_TracingMacrosDetails.cpp @@ -4,7 +4,7 @@ #include "gtest/gtest.h" -#include "TracingMacros.hpp" +#include "core/vasio/io/util/TracingMacros.hpp" #include diff --git a/SilKit/source/core/vasio/io/util/TracingMacros.hpp b/SilKit/source/core/vasio/io/util/TracingMacros.hpp index b39924a40..e2ac05052 100644 --- a/SilKit/source/core/vasio/io/util/TracingMacros.hpp +++ b/SilKit/source/core/vasio/io/util/TracingMacros.hpp @@ -5,7 +5,7 @@ #pragma once -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include #include diff --git a/SilKit/source/core/vasio/mock/MockConnectKnownParticipantsListener.hpp b/SilKit/source/core/vasio/mock/MockConnectKnownParticipantsListener.hpp index a85c3d3af..a8f522047 100644 --- a/SilKit/source/core/vasio/mock/MockConnectKnownParticipantsListener.hpp +++ b/SilKit/source/core/vasio/mock/MockConnectKnownParticipantsListener.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IConnectKnownParticipantsListener.hpp" +#include "core/vasio/IConnectKnownParticipantsListener.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/mock/MockConnectPeer.hpp b/SilKit/source/core/vasio/mock/MockConnectPeer.hpp index 0d144ab86..ca775c55e 100644 --- a/SilKit/source/core/vasio/mock/MockConnectPeer.hpp +++ b/SilKit/source/core/vasio/mock/MockConnectPeer.hpp @@ -5,9 +5,9 @@ #pragma once -#include "IConnectPeer.hpp" +#include "core/vasio/IConnectPeer.hpp" -#include "Uri.hpp" +#include "util/Uri.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/mock/MockConnectionMethods.hpp b/SilKit/source/core/vasio/mock/MockConnectionMethods.hpp index 38d48ac07..43e277fec 100644 --- a/SilKit/source/core/vasio/mock/MockConnectionMethods.hpp +++ b/SilKit/source/core/vasio/mock/MockConnectionMethods.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IConnectionMethods.hpp" +#include "core/vasio/IConnectionMethods.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/SilKit/source/core/vasio/mock/MockVAsioPeer.hpp b/SilKit/source/core/vasio/mock/MockVAsioPeer.hpp index 1a054798a..02257a6ab 100644 --- a/SilKit/source/core/vasio/mock/MockVAsioPeer.hpp +++ b/SilKit/source/core/vasio/mock/MockVAsioPeer.hpp @@ -12,7 +12,7 @@ #pragma once -#include "IVAsioPeer.hpp" +#include "core/vasio/IVAsioPeer.hpp" #include "gtest/gtest.h" #include "gmock/gmock.h"