diff --git a/src/cpp/fastdds/core/Time_t.cpp b/src/cpp/fastdds/core/Time_t.cpp index adf8266c99b..00a82cee0e3 100644 --- a/src/cpp/fastdds/core/Time_t.cpp +++ b/src/cpp/fastdds/core/Time_t.cpp @@ -12,32 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -/** - * @file Time_t.cpp - * - */ - -// Copyright 2019 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. - -/** - * @file Time_t.cpp - */ #include -#include #include +#include #include diff --git a/src/cpp/utils/time_t_helpers.hpp b/src/cpp/utils/time_t_helpers.hpp index 30328551b5c..2cebe2a128d 100644 --- a/src/cpp/utils/time_t_helpers.hpp +++ b/src/cpp/utils/time_t_helpers.hpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef UTILS__TIMETHELPERS_HPP -#define UTILS__TIMETHELPERS_HPP +#ifndef FASTDDS_UTILS__TIMETHELPERS_HPP +#define FASTDDS_UTILS__TIMETHELPERS_HPP -#include #include +#include // unnamed namespace for inline functions in compilation unit. Better practice than static inline. constexpr uint64_t C_FRACTIONS_PER_SEC = 4294967296ULL; @@ -52,4 +52,4 @@ static void current_time_since_unix_epoch( nanosecs = static_cast(duration_cast(t_since_epoch).count()); } -#endif // UTILS__TIMETHELPERS_HPP +#endif // FASTDDS_UTILS__TIMETHELPERS_HPP diff --git a/versions.md b/versions.md index 965dc89ef10..1cfa97a2914 100644 --- a/versions.md +++ b/versions.md @@ -96,7 +96,7 @@ Forthcoming * Setting vendor_id in the received CacheChange_t for Data and DataFrag. * Added new DynamicData to JSON serializer (`json_serialize`). * Added new DynamicType to IDL serializer (`idl_serialize`). -* `eprosima::fastdds::Time_t` moved to `eprosima::fastdds::dds::Time_t`. +* DDS implementation of `eprosima::fastdds::Time_t` moved to `eprosima::fastdds::dds::Time_t`. Version 2.14.0 --------------