summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2014-10-10 21:58:31 +0000
committerSteve Huston <shuston@riverace.com>2022-03-29 21:34:12 +0000
commite04b4e5c0d713026fb58bb580dd8f66a5cd6282a (patch)
tree377ee93986c07a22e8b752a20c5d73920f85fae9
parent9b7b7079f31ca77db96bd1e075b52002e894453b (diff)
downloadATCD-e04b4e5c0d713026fb58bb580dd8f66a5cd6282a.tar.gz
Pick up changes from this set:
Commit ad906bbed19 ChangeLogTag:Thu Oct 9 16:21:38 UTC 2014 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/apps/drwho/File_Manager.cpp2
-rw-r--r--ACE/tests/Naming_Test.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/ACE/apps/drwho/File_Manager.cpp b/ACE/apps/drwho/File_Manager.cpp
index 2edfde45bc9..c8aae1515cf 100644
--- a/ACE/apps/drwho/File_Manager.cpp
+++ b/ACE/apps/drwho/File_Manager.cpp
@@ -71,7 +71,7 @@ File_Manager::get_login_and_real_name (const char *&login_name, const char *&rea
int
File_Manager::open_passwd_file (void)
{
- char *filename = const_cast<char *> ("passwd-XXXXXX");
+ char *filename = "passwd-XXXXXX";
ACE_HANDLE f = ACE_OS::mkstemp (filename);
FILE *fp = ACE_OS::fdopen (f, "w");
diff --git a/ACE/tests/Naming_Test.cpp b/ACE/tests/Naming_Test.cpp
index b365debb2bd..d5349e08b57 100644
--- a/ACE/tests/Naming_Test.cpp
+++ b/ACE/tests/Naming_Test.cpp
@@ -263,7 +263,7 @@ run_main (int argc, ACE_TCHAR *argv[])
ACE_TEXT ("%s%d"),
#endif
pname,
- (int)(ACE_OS::getpid ()));
+ ACE_OS::getpid ());
name_options->database (temp_file);
}