diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/TAO_IDL/driver/drv_preproc.cpp | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c8bc6cac075..94da7a0c2ad 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 8 09:05:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/driver/drv_preproc.cpp + ACE_TCHAR fixes + Wed Oct 8 08:37:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tao/CSD_Framework/CSD_ORBInitializer.cpp: diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 4cb22e5c6e5..afd8040317e 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -100,8 +100,8 @@ ACE_TCHAR const * DRV_arglist[DRV_MAX_ARGCOUNT] = { 0 }; static char const * output_arg_format = 0; static long output_arg_index = 0; -ACE_TCHAR const DIR_DOT[] = ACE_TEXT ("."); -ACE_TCHAR const DIR_DOT_DOT[] = ACE_TEXT (".."); +char const DIR_DOT[] = "."; +char const DIR_DOT_DOT[] = ".."; // File names. static char tmp_file [MAXPATHLEN + 1] = { 0 }; @@ -335,7 +335,7 @@ DRV_sweep_dirs (const char *rel_path, -1); } - ACE_Dirent dir (DIR_DOT); + ACE_Dirent dir (ACE_TEXT_CHAR_TO_TCHAR(DIR_DOT)); ACE_CString bname (base_path); bname += (bname.length () > 0 ? "/" : ""); bname += rel_path; @@ -346,8 +346,8 @@ DRV_sweep_dirs (const char *rel_path, for (ACE_DIRENT *dir_entry; (dir_entry = dir.read ()) != 0;) { // Skip the ".." and "." files in each directory. - if (ACE_OS::strcmp (dir_entry->d_name, DIR_DOT) == 0 - || ACE_OS::strcmp (dir_entry->d_name, DIR_DOT_DOT) == 0) + if (ACE_OS::strcmp (ACE_TEXT_ALWAYS_CHAR(dir_entry->d_name), DIR_DOT) == 0 + || ACE_OS::strcmp (ACE_TEXT_ALWAYS_CHAR(dir_entry->d_name), DIR_DOT_DOT) == 0) { continue; } |