From 1342f8e12e0c0c085e7f174175e0c1aa4c361c3a Mon Sep 17 00:00:00 2001 From: Jaison Titus Date: Fri, 18 Oct 2019 14:32:26 -0700 Subject: [PATCH] Moved qos_converter to include/ since it needs to be accessible to topic_cache.hpp Signed-off-by: Jaison Titus --- .../rmw_fastrtps_shared_cpp}/qos_converter.hpp | 8 ++++---- rmw_fastrtps_shared_cpp/src/qos.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename rmw_fastrtps_shared_cpp/{src => include/rmw_fastrtps_shared_cpp}/qos_converter.hpp (92%) diff --git a/rmw_fastrtps_shared_cpp/src/qos_converter.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/qos_converter.hpp similarity index 92% rename from rmw_fastrtps_shared_cpp/src/qos_converter.hpp rename to rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/qos_converter.hpp index 6f7460cd1..c78ddb6c9 100644 --- a/rmw_fastrtps_shared_cpp/src/qos_converter.hpp +++ b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/qos_converter.hpp @@ -1,4 +1,4 @@ -// Copyright 2016-2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,8 +13,8 @@ // limitations under the License. -#ifndef QOS_CONVERTER_HPP_ -#define QOS_CONVERTER_HPP_ +#ifndef RMW_FASTRTPS_SHARED_CPP__QOS_CONVERTER_HPP_ +#define RMW_FASTRTPS_SHARED_CPP__QOS_CONVERTER_HPP_ #include "rmw/types.h" @@ -83,4 +83,4 @@ dds_qos_to_rmw_qos( qos->liveliness_lease_duration.nsec = dds_qos.m_liveliness.lease_duration.nanosec; } -#endif // QOS_CONVERTER_HPP_ +#endif // RMW_FASTRTPS_SHARED_CPP__QOS_CONVERTER_HPP_ diff --git a/rmw_fastrtps_shared_cpp/src/qos.cpp b/rmw_fastrtps_shared_cpp/src/qos.cpp index beaae41fb..72aaece31 100644 --- a/rmw_fastrtps_shared_cpp/src/qos.cpp +++ b/rmw_fastrtps_shared_cpp/src/qos.cpp @@ -14,7 +14,7 @@ #include -#include "qos_converter.hpp" +#include "rmw_fastrtps_shared_cpp/qos_converter.hpp" #include "rmw_fastrtps_shared_cpp/qos.hpp" #include "fastrtps/attributes/PublisherAttributes.h"