diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-23 16:19:38 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-23 16:19:38 -0400 |
| commit | ada25bad3511a359eb28cf48f018d6a42e166f10 (patch) | |
| tree | 430749f887a1c6f708c2d4a23b3e3ec4ef18ef2c /cpp/src/IceGrid/Activator.cpp | |
| parent | Ruby 1.8 fix (diff) | |
| download | ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.bz2 ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.xz ice-ada25bad3511a359eb28cf48f018d6a42e166f10.zip | |
Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs files
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index bcc8ee77576..ea4e7e3e502 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -231,7 +231,7 @@ stringToSignal(const string& str) } else #endif - if(str == ICE_STRING(SIGKILL)) + if(str == ICE_STRING(SIGKILL)) { return SIGKILL; } @@ -248,10 +248,10 @@ stringToSignal(const string& str) if(*end == '\0' && signal > 0 && signal < 64) { #ifdef _WIN32 - if(signal == SIGKILL || signal == SIGTERM) - { - return static_cast<int>(signal); - } + if(signal == SIGKILL || signal == SIGTERM) + { + return static_cast<int>(signal); + } #else return static_cast<int>(signal); #endif |