summaryrefslogtreecommitdiff
path: root/ACE/ace/Lib_Find.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-06-01 05:22:32 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-06-01 05:22:32 +0000
commit7269f67477fd9db97e2e9fc2c20abe3a7eabecd2 (patch)
treefc0bdf8bd963ea4dcac1573f45a5e107d5db4f1d /ACE/ace/Lib_Find.cpp
parentd8ed3675f698d6840f115a1cde54518d59d8a62c (diff)
downloadATCD-7269f67477fd9db97e2e9fc2c20abe3a7eabecd2.tar.gz
Mon Jun 1 05:22:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Lib_Find.cpp: Fixed gcc4.4 warnings
Diffstat (limited to 'ACE/ace/Lib_Find.cpp')
-rw-r--r--ACE/ace/Lib_Find.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp
index 3caa58bf19e..d648700d60d 100644
--- a/ACE/ace/Lib_Find.cpp
+++ b/ACE/ace/Lib_Find.cpp
@@ -375,7 +375,7 @@ ACE::ldfind (const ACE_TCHAR* filename,
else if (pathlen > 0)
return 0;
#else
- ACE_TCHAR *ld_path;
+ const ACE_TCHAR *ld_path = 0;
# if defined ACE_DEFAULT_LD_SEARCH_PATH
ld_path = ACE_DEFAULT_LD_SEARCH_PATH;
# else
@@ -593,8 +593,8 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
buffer);
// Make sure to return -1 if there is an error
- if (result == 0 && ::GetLastError () != ERROR_SUCCESS
- || result > static_cast<int> (buffer_len))
+ if ((result == 0 && ::GetLastError () != ERROR_SUCCESS)
+ || (result > static_cast<int> (buffer_len)))
result = -1;
#else /* ACE_WIN32 */