diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2012-11-09 08:29:26 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2012-11-09 08:29:26 +0000 |
| commit | d36107bc9224b2feb40a00a409ca5c0da19cd3c5 (patch) | |
| tree | a783952c46e4090ebaa9fd64ae05c156fe4a4430 | |
| parent | 9e779832ee40af0c4f88fdc3612e4cfe2d03f34f (diff) | |
| download | ATCD-d36107bc9224b2feb40a00a409ca5c0da19cd3c5.tar.gz | |
ChangelogTag: Fri Nov 9 08:28:23 UTC 2012 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index bb2457edea5..e8fdf68fdd0 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 9 08:28:23 UTC 2012 Martin Corino <mcorino@remedy.nl> + + * ace/OS_NS_Thread.inl: + Fixed compile error resulting from previous change. + Wed Nov 7 19:16:47 UTC 2012 Martin Corino <mcorino@remedy.nl> * ace/OS_NS_Thread.inl: diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 1b6438cc1a5..48a49cef1d8 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -200,8 +200,8 @@ ACE_OS::condattr_synctype (ACE_condattr_t &attributes, int& type) } # else ACE_UNUSED_ARG (attributes); + int result = 0; type = USYNC_THREAD; - result = 0; # endif /* !ACE_LACKS_CONDATTR && _POSIX_THREAD_PROCESS_SHARED && ! ACE_LACKS_CONDATTR_PSHARED */ return result; |