From 43578a73e89617ead770cd277659c79c3d4583e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez?= Date: Thu, 21 Dec 2023 07:18:06 +0100 Subject: [PATCH] Move dds types (#4179) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- include/fastdds/dds/core/Types.hpp | 32 +++++++++++++++++++ .../fastdds/dds/core/policy/QosPolicies.hpp | 3 -- include/fastrtps/types/TypesBase.h | 6 +--- 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 include/fastdds/dds/core/Types.hpp diff --git a/include/fastdds/dds/core/Types.hpp b/include/fastdds/dds/core/Types.hpp new file mode 100644 index 00000000000..8f24af6545b --- /dev/null +++ b/include/fastdds/dds/core/Types.hpp @@ -0,0 +1,32 @@ +// Copyright 2023 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef FASTDDS_DDS_CORE_TYPES_HPP +#define FASTDDS_DDS_CORE_TYPES_HPP + +#include + +namespace eprosima { +namespace fastdds { +namespace dds { + +typedef uint32_t DomainId_t; + +const int32_t LENGTH_UNLIMITED = -1; + +} // namespace dds +} // namespace fastdds +} // namespace eprosima + +#endif // FASTDDS_DDS_CORE_TYPES_HPP diff --git a/include/fastdds/dds/core/policy/QosPolicies.hpp b/include/fastdds/dds/core/policy/QosPolicies.hpp index ca7bf893ec4..65b9869caa2 100644 --- a/include/fastdds/dds/core/policy/QosPolicies.hpp +++ b/include/fastdds/dds/core/policy/QosPolicies.hpp @@ -1710,9 +1710,6 @@ class HistoryQosPolicy : public Parameter_t, public QosPolicy int32_t depth; }; -//! A special value indicating an unlimited quantity -constexpr int32_t LENGTH_UNLIMITED = -1; - /** * Specifies the resources that the Service can consume in order to meet the requested QoS * diff --git a/include/fastrtps/types/TypesBase.h b/include/fastrtps/types/TypesBase.h index 2a1ec9cc378..0a6d206cccd 100644 --- a/include/fastrtps/types/TypesBase.h +++ b/include/fastrtps/types/TypesBase.h @@ -25,14 +25,10 @@ #include #include +#include #include namespace eprosima { -namespace fastdds { -namespace dds { -using DomainId_t = uint32_t; -} // dds -} // namespace fastdds namespace fastcdr { class Cdr;