diff options
| author | Michi Henning <michi@zeroc.com> | 2002-11-13 01:56:52 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2002-11-13 01:56:52 +0000 |
| commit | 9c652b4d25352decfa13d063ae386e17ec6f527b (patch) | |
| tree | f7f8407ad177c7c67efd0728f1d6f8f4e411b0ab /cpp | |
| parent | IcePack bug fixes. (diff) | |
| download | ice-9c652b4d25352decfa13d063ae386e17ec6f527b.tar.bz2 ice-9c652b4d25352decfa13d063ae386e17ec6f527b.tar.xz ice-9c652b4d25352decfa13d063ae386e17ec6f527b.zip | |
Fixed botched changes for Windows.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/IceUtil/Thread.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/Thread.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index cbd8f88504c..f9d954dee95 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -98,7 +98,7 @@ public: Thread(); virtual ~Thread(); - //pthread_t id() const; + ThreadId id() const; virtual void run() = 0; diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp index 290986dd6fd..41e96cc1ac7 100644 --- a/cpp/src/IceUtil/Thread.cpp +++ b/cpp/src/IceUtil/Thread.cpp @@ -99,12 +99,11 @@ IceUtil::Thread::~Thread() { } -/*
+IceUtil::Thread::ThreadId IceUtil::Thread::id() const { return _id; -}
-*/ +} static void* startHook(void* arg) |