diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /cpp/include/IceUtil/Cond.h | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'cpp/include/IceUtil/Cond.h')
| -rw-r--r-- | cpp/include/IceUtil/Cond.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h index 901b779ebc1..ff4aa2a4f4d 100644 --- a/cpp/include/IceUtil/Cond.h +++ b/cpp/include/IceUtil/Cond.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_COND_H -#define ICE_UTIL_COND_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Time.h> @@ -268,5 +267,3 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const #endif } // End namespace IceUtil - -#endif |