diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-31 07:54:45 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-31 07:54:45 +0000 |
| commit | c5b0829e61b8983285e2151256b1ce0d56eb328c (patch) | |
| tree | 562a3eefafc958a8b538a06a3446d9cc8a52d991 | |
| parent | a9ac1cfac5239ebfcd5a51492a6ea11c414df11a (diff) | |
| download | ATCD-c5b0829e61b8983285e2151256b1ce0d56eb328c.tar.gz | |
ChangeLogTag: Mon Jan 31 07:54:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/utils/NamingViewer/NamingViewer.cpp | 4 | ||||
| -rw-r--r-- | TAO/utils/NamingViewer/SelectNSDialog.cpp | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp index a1b60a4386b..5f26bb90065 100644 --- a/TAO/utils/NamingViewer/NamingViewer.cpp +++ b/TAO/utils/NamingViewer/NamingViewer.cpp @@ -54,13 +54,13 @@ BOOL CNamingViewerApp::InitInstance() #endif // Parse command line arguments so we can initialize ORB with them - ACE_ARGV Argv(m_lpCmdLine); + ACE_ARGV Argv(ACE_TEXT_CHAR_TO_TCHAR(m_lpCmdLine)); ACE::init(); { int argc = Argv.argc(); - char** argv = Argv.argv(); + ACE_TCHAR** argv = Argv.argv(); CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv); CNamingViewerDlg dlg(ORB); m_pMainWnd = &dlg; diff --git a/TAO/utils/NamingViewer/SelectNSDialog.cpp b/TAO/utils/NamingViewer/SelectNSDialog.cpp index 968ce45c7c7..2556cfeff38 100644 --- a/TAO/utils/NamingViewer/SelectNSDialog.cpp +++ b/TAO/utils/NamingViewer/SelectNSDialog.cpp @@ -6,6 +6,8 @@ #include "NamingViewer.h" #include "SelectNSDialog.h" #include "AddNameServerDlg.h" +#include "ace/SString.h" +#include "ace/OS_NS_String.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -71,11 +73,11 @@ void CSelectNSDialog::OnAdd() return; } ACE_Configuration_Section_Key Section = m_pConfig->root_section(); - ACE_TString Value = Dialog.m_IOR; + ACE_CString Value = Dialog.m_IOR; m_pConfig->set_string_value(Section, Dialog.m_Name, Value); int pos = m_Servers.AddString(Dialog.m_Name); char* pIOR = new char[Value.length() + 1]; - strcpy(pIOR, Value.c_str()); + ACE_OS::strcpy(pIOR, Value.c_str()); m_Servers.SetItemData(pos, (DWORD)pIOR); } @@ -101,7 +103,7 @@ BOOL CSelectNSDialog::OnInitDialog() CDialog::OnInitDialog(); // TODO: Add extra initialization here - HKEY hKey = ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE, "Software\\TAO\\NamingViewer\\Servers"); + HKEY hKey = ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE, ACE_TEXT("Software\\TAO\\NamingViewer\\Servers")); m_pConfig = new ACE_Configuration_Win32Registry(hKey); ACE_Configuration_Section_Key Section = m_pConfig->root_section();; int index = 0; @@ -114,7 +116,7 @@ BOOL CSelectNSDialog::OnInitDialog() { int pos = m_Servers.AddString(name.c_str()); char* pIOR = new char[value.length() + 1]; - strcpy(pIOR, value.c_str()); + ACE_OS::strcpy(pIOR, value.c_str()); m_Servers.SetItemData(pos, (DWORD)pIOR); } index++; |