diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Naming_Context.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Naming_Context.cpp')
| -rw-r--r-- | dep/acelite/ace/Naming_Context.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dep/acelite/ace/Naming_Context.cpp b/dep/acelite/ace/Naming_Context.cpp index 4bf312e8ad8..bca3b9b87d9 100644 --- a/dep/acelite/ace/Naming_Context.cpp +++ b/dep/acelite/ace/Naming_Context.cpp @@ -1,4 +1,4 @@ -// $Id: Naming_Context.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Naming_Context.cpp 93539 2011-03-13 09:40:44Z vzykov $ #include "ace/Get_Opt.h" #include "ace/Naming_Context.h" @@ -626,7 +626,7 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) "\t[-b base address]\n" "\t[-v] (verbose)\n" "\t[-r] (use Win32 Registry)\n", - argv[0]); + ACE_TEXT_ALWAYS_CHAR (argv[0])); /* NOTREACHED */ break; } |