diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-02-01 17:09:49 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-02-01 17:09:49 +0000 |
| commit | abada90e3f84dc703b8ddc9efcbed8a946fadead (patch) | |
| tree | 2c6f9dccd510ea97cb927a7bd635422efaae547a /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | removing trace message (diff) | |
| download | ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.tar.bz2 ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.tar.xz ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.zip | |
Expanded tabs into spaces
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index d1b25c1a46c..769b0368b19 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -66,21 +66,21 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc libName = libSpec; if(useIceVersion) { - int majorVersion = (ICE_INT_VERSION / 10000); - int minorVersion = (ICE_INT_VERSION / 100) - majorVersion * 100; - ostringstream os; - os << majorVersion * 10 + minorVersion; + int majorVersion = (ICE_INT_VERSION / 10000); + int minorVersion = (ICE_INT_VERSION / 100) - majorVersion * 100; + ostringstream os; + os << majorVersion * 10 + minorVersion; - int patchVersion = ICE_INT_VERSION % 100; - if(patchVersion > 50) - { - os << 'b'; - if(patchVersion >= 52) - { - os << (patchVersion - 50); - } - } - version = os.str(); + int patchVersion = ICE_INT_VERSION % 100; + if(patchVersion > 50) + { + os << 'b'; + if(patchVersion >= 52) + { + os << (patchVersion - 50); + } + } + version = os.str(); } } else @@ -101,7 +101,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc lib = "lib" + libName; if(!version.empty()) { - lib += "." + version; + lib += "." + version; } lib += ".dylib"; #elif defined(__hpux) @@ -112,7 +112,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc } else { - lib += ".sl"; + lib += ".sl"; } #elif defined(_AIX) lib = "lib" + libName + ".a(lib" + libName + ".so"; |