diff options
| author | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
| commit | 7f80ea0db36533c25ffacfccb05a4b8ee657a95f (patch) | |
| tree | 7b619b723fa94ac7996ca9578eae3fbf40f4cc9e /cpp/src/Ice/CountDownLatch.cpp | |
| parent | ICE-7707 Improved handling of argc/argv arguments (diff) | |
| parent | ICE-7483 - Rename OS X to macOS (diff) | |
| download | ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.bz2 ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.xz ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/Ice/CountDownLatch.cpp')
| -rw-r--r-- | cpp/src/Ice/CountDownLatch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp index 53887744c01..3a363cc3709 100644 --- a/cpp/src/Ice/CountDownLatch.cpp +++ b/cpp/src/Ice/CountDownLatch.cpp @@ -115,7 +115,7 @@ IceUtilInternal::CountDownLatch::countDown() } #if defined(__APPLE__) // - // On OS X we do the broadcast with the mutex held. This seems to + // On macOS we do the broadcast with the mutex held. This seems to // be necessary to prevent the broadcast call to hang (spinning in // an infinite loop). // |