diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-12-03 10:02:49 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-12-03 10:02:49 +0100 |
| commit | 7464e320b77f207b722b402f6710a1eda6fb12f1 (patch) | |
| tree | 319e7ca10d7cf959585cdb8dda065421cc13578b /cpp/src | |
| parent | Fixed ICE-5078 - sent callback called from wrong thread (diff) | |
| download | ice-7464e320b77f207b722b402f6710a1eda6fb12f1.tar.bz2 ice-7464e320b77f207b722b402f6710a1eda6fb12f1.tar.xz ice-7464e320b77f207b722b402f6710a1eda6fb12f1.zip | |
Fixed ICE-4998 - Remove Mac OS references from documentation files
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IceUtil/CountDownLatch.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/IceUtil/CtrlCHandler.cpp | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index a054705c4fe..3536799ba41 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -700,9 +700,10 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol } while(info == 0 && rs == EAI_AGAIN && --retry >= 0); - // In theory, getaddrinfo should only return EAI_NONAME if AI_NUMERICHOST is specified and the host name - // is not a IP address. However on some platforms (e.g. Mac OS X 10.4.x) EAI_NODATA is also returned so - // we also check for it. + // In theory, getaddrinfo should only return EAI_NONAME if + // AI_NUMERICHOST is specified and the host name is not a IP + // address. However on some platforms (e.g. OS X 10.4.x) + // EAI_NODATA is also returned so we also check for it. #ifdef EAI_NODATA if(!blocking && (rs == EAI_NONAME || rs == EAI_NODATA)) #else diff --git a/cpp/src/IceUtil/CountDownLatch.cpp b/cpp/src/IceUtil/CountDownLatch.cpp index 05e6be3d5df..66c0a39c1e6 100644 --- a/cpp/src/IceUtil/CountDownLatch.cpp +++ b/cpp/src/IceUtil/CountDownLatch.cpp @@ -111,8 +111,9 @@ IceUtilInternal::CountDownLatch::countDown() } #if defined(__APPLE__) // - // On MacOS X 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). + // On OS X 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). // if(broadcast) { diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp index bb6bbb9f2a3..a6f2c6e9329 100644 --- a/cpp/src/IceUtil/CtrlCHandler.cpp +++ b/cpp/src/IceUtil/CtrlCHandler.cpp @@ -158,7 +158,7 @@ sigwaitThread(void*) int rc = sigwait(&ctrlCLikeSignals, &signal); #if defined(__APPLE__) // - // WORKAROUND: sigwait is not a cancelation point on MacOS X. To cancel this thread, the + // WORKAROUND: sigwait is not a cancelation point on OS X. To cancel this thread, the // destructor cancels the thread and send a signal to the thread to unblock sigwait, then // we explicitly test for cancellation. // @@ -239,7 +239,7 @@ CtrlCHandler::~CtrlCHandler() assert(rc == 0); #if defined(__APPLE__) // - // WORKAROUND: sigwait isn't a cancellation point on MacOS X, see + // WORKAROUND: sigwait isn't a cancellation point on OS X, see // comment in sigwaitThread // pthread_kill(_tid, SIGTERM); |