aboutsummaryrefslogtreecommitdiff
path: root/dep/acelite/ace/Lib_Find.cpp
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-09-17 23:21:01 +0100
committerNay <dnpd.dd@gmail.com>2012-09-17 23:21:01 +0100
commit2e21fa6b925c4572d620248f1b149a5d652836b2 (patch)
treed0ff026bc848d7ee466c9b793f42fb9ec4f07f62 /dep/acelite/ace/Lib_Find.cpp
parent6ebc6b9a76d0a4576306d777b35ec1a37d3ec5da (diff)
Core/Dependencies: Update ACE to v6.1.4 (Windows only)
Tested in multiple configurations .diff with TC changes added
Diffstat (limited to 'dep/acelite/ace/Lib_Find.cpp')
-rw-r--r--dep/acelite/ace/Lib_Find.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/dep/acelite/ace/Lib_Find.cpp b/dep/acelite/ace/Lib_Find.cpp
index c5a0610f065..6c63df21b55 100644
--- a/dep/acelite/ace/Lib_Find.cpp
+++ b/dep/acelite/ace/Lib_Find.cpp
@@ -1,4 +1,4 @@
-// $Id: Lib_Find.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Lib_Find.cpp 95630 2012-03-22 13:04:47Z johnnyw $
#include "ace/Lib_Find.h"
#include "ace/Log_Msg.h"
@@ -608,7 +608,13 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
const char *tmpdir = ACE_OS::getenv ("TMPDIR");
if (tmpdir == 0)
- tmpdir = "/tmp";
+ {
+#if defined (ACE_DEFAULT_TEMP_DIR)
+ tmpdir = ACE_DEFAULT_TEMP_DIR;
+#else
+ tmpdir = "/tmp";
+#endif
+ }
size_t len = ACE_OS::strlen (tmpdir);
@@ -653,7 +659,10 @@ ACE::open_temp_file (const ACE_TCHAR *name, int mode, int perm)
// Unlink it so that the file will be removed automatically when the
// process goes away.
if (ACE_OS::unlink (name) == -1)
- return ACE_INVALID_HANDLE;
+ {
+ ACE_OS::close (handle);
+ return ACE_INVALID_HANDLE;
+ }
else
// Return the handle.
return handle;