summaryrefslogtreecommitdiff
path: root/TAO/utils/NamingViewer/NamingViewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/utils/NamingViewer/NamingViewer.cpp')
-rw-r--r--TAO/utils/NamingViewer/NamingViewer.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp
index a1b60a4386b..2f86a0d3a4a 100644
--- a/TAO/utils/NamingViewer/NamingViewer.cpp
+++ b/TAO/utils/NamingViewer/NamingViewer.cpp
@@ -5,6 +5,7 @@
#include "NamingViewerDlg.h"
#include "ace/ARGV.h"
#include "ace/ACE.h"
+#include "ace/Argv_Type_Converter.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -47,21 +48,24 @@ BOOL CNamingViewerApp::InitInstance()
// of your final executable, you should remove from the following
// the specific initialization routines you do not need.
+#if !defined (_WIN32_WCE)
#ifdef _AFXDLL
Enable3dControls(); // Call this when using MFC in a shared DLL
#else
Enable3dControlsStatic(); // Call this when linking to MFC statically
#endif
+#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();
- CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv);
+ ACE_Argv_Type_Converter argcon (argc, Argv.argv ());
+ CORBA::ORB_var ORB = CORBA::ORB_init(argcon.get_argc (),
+ argcon.get_ASCII_argv ());
CNamingViewerDlg dlg(ORB);
m_pMainWnd = &dlg;
int nResponse = dlg.DoModal();