Skip to content

Commit

Permalink
Fix build on msvc 19.36.32528 (#3467)
Browse files Browse the repository at this point in the history
* Refs #18147. Fix build on new MSVC versions

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Document reason for alias.

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Fix linter.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 14de049)

Co-authored-by: Miguel Company <[email protected]>
  • Loading branch information
mergify[bot] and MiguelCompany authored Apr 21, 2023
1 parent f18abf8 commit 02281c4
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions include/fastrtps/utils/TimedMutex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,16 @@ namespace eprosima {
namespace fastrtps {

#if defined(_WIN32)

class TimedMutex
{
// On MSVC 19.36.32528.95 `xtime` was changed into `_timespec64`.
// See https://github.com/eProsima/Fast-DDS/issues/3451
// See https://github.com/microsoft/STL/pull/3594
#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528
using xtime = _timespec64;
#endif // _MSC_FULL_VER check

public:

TimedMutex()
Expand Down

0 comments on commit 02281c4

Please sign in to comment.