Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the macro definition _Thrd_success in thread #3775

Closed
wants to merge 26 commits into from
Closed

Fix the macro definition _Thrd_success in thread #3775

Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
32078e4
Fix macro definition in thread stl
jimwang118 Aug 2, 2023
5f57bde
Fix macro definition in thread stl
jimwang118 Aug 2, 2023
4d25905
fix macro in thread
jimwang118 Aug 3, 2023
db75ba7
Merge branch 'fix_STL_use' of https://github.com/jimwang118/Fast-DDS …
jimwang118 Aug 3, 2023
fb28096
fix macro in thread
jimwang118 Aug 3, 2023
0c69f97
fix macro on thread
jimwang118 Aug 4, 2023
14967a9
fix macro on thread
jimwang118 Aug 4, 2023
7e8087d
fix macro on thread
jimwang118 Aug 4, 2023
aab26c0
Merge branch 'master' into fix_STL_use
jimwang118 Aug 22, 2023
2d4d3c1
Modify return value comparison
jimwang118 Aug 22, 2023
4e6328e
Fix XMLParser null-derefence in parseLogConfig (#3769)
EduPonz Aug 2, 2023
4b9f3c3
Fix macro definition in thread stl
jimwang118 Aug 2, 2023
6a89cf8
fix macro in thread
jimwang118 Aug 3, 2023
2d55134
Fix macro definition in thread stl
jimwang118 Aug 2, 2023
b620a2a
fix macro in thread
jimwang118 Aug 3, 2023
b48b645
fix macro on thread
jimwang118 Aug 4, 2023
04c3111
fix macro on thread
jimwang118 Aug 4, 2023
a4548f5
fix macro on thread
jimwang118 Aug 4, 2023
8e7e5f7
User configuration for SHM metatraffic (#3753)
MiguelCompany Aug 2, 2023
99a52fb
Allow participant profiles with no rtps tag (#3771)
EduPonz Aug 3, 2023
bc7c1a7
Custom pools on DDS layer feature (#3755)
JesusPoderoso Aug 3, 2023
aa15d04
Fix encapsulation format in WLP (#3784)
EduPonz Aug 7, 2023
1aac62d
Fix RemoteBuiltinEndpointHonoring blackbox test (#3787)
MiguelCompany Aug 11, 2023
f10790b
Fix DomainParticipant::register_remote_type return when negotiating t…
EduPonz Aug 11, 2023
64737e6
Modify return value comparison
jimwang118 Aug 22, 2023
286e5d7
Merge branch 'fix_STL_use' of https://github.com/jimwang118/Fast-DDS …
jimwang118 Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions include/fastrtps/utils/TimedMutex.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ class TimedMutex
// 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

#endif
public:

TimedMutex()
Expand Down Expand Up @@ -98,11 +97,11 @@ class TimedMutex
nsecs -= secs;
max_wait.tv_sec += secs.count();
max_wait.tv_nsec = (long)nsecs.count();
return (_Thrd_success == _Mtx_timedlock(mutex_, (xtime*)&max_wait));
return (0 == static_cast<int>(_Mtx_timedlock(mutex_, (xtime*)&max_wait)));
}
else
{
return (_Thrd_success == _Mtx_trylock(mutex_));
return (0 == static_cast<int>(_Mtx_trylock(mutex_)));
}
}

Expand Down Expand Up @@ -147,7 +146,7 @@ class RecursiveTimedMutex

bool try_lock()
{
return (_Thrd_success == _Mtx_trylock(mutex_));
return (0 == static_cast<int>(_Mtx_trylock(mutex_)));
}

template <class Rep, class Period>
Expand All @@ -173,11 +172,11 @@ class RecursiveTimedMutex
nsecs -= secs;
max_wait.tv_sec += secs.count();
max_wait.tv_nsec = (long)nsecs.count();
return (_Thrd_success == _Mtx_timedlock(mutex_, (xtime*)&max_wait));
return (0 == static_cast<int>(_Mtx_timedlock(mutex_, (xtime*)&max_wait)));
}
else
{
return (_Thrd_success == _Mtx_trylock(mutex_));
return (0 == static_cast<int>(_Mtx_trylock(mutex_)));
}
}

Expand Down