diff options
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/DLL.cpp | 8 | ||||
| -rw-r--r-- | ace/DLL.h | 4 | ||||
| -rw-r--r-- | ace/INET_Addr.h | 12 | ||||
| -rw-r--r-- | ace/OS.cpp | 17 | ||||
| -rw-r--r-- | ace/OS.h | 12 | ||||
| -rw-r--r-- | ace/config-WinCE.h | 8 |
6 files changed, 17 insertions, 44 deletions
diff --git a/ace/DLL.cpp b/ace/DLL.cpp index 3f6569e7ac7..db43090bd7a 100644 --- a/ace/DLL.cpp +++ b/ace/DLL.cpp @@ -18,10 +18,10 @@ ACE_DLL::ACE_DLL (int close_on_destruction) // If the library name and the opening mode are specified than on // object creation the library is implicitly opened. -ACE_DLL::ACE_DLL (const char *dll_name, +ACE_DLL::ACE_DLL (const ASYS_TCHAR *dll_name, int open_mode, int close_on_destruction) - : handle_ (ACE_OS::dlopen (ASYS_WIDE_STRING (dll_name), + : handle_ (ACE_OS::dlopen (dll_name, open_mode)), close_on_destruction_ (close_on_destruction) { @@ -53,7 +53,7 @@ ACE_DLL::~ACE_DLL (void) // relocation processing of any other object. int -ACE_DLL::open (const char *dll_filename, +ACE_DLL::open (const ASYS_TCHAR *dll_filename, int open_mode, int close_on_destruction) { @@ -69,7 +69,7 @@ ACE_DLL::open (const char *dll_filename, // Transform the pathname into the appropriate dynamic link library // by searching the ACE_LD_SEARCH_PATH. - int result = ACE::ldfind (ASYS_WIDE_STRING (dll_filename), + int result = ACE::ldfind (dll_filename, dll_pathname, (sizeof dll_pathname / sizeof (ASYS_TCHAR))); // Check for errors diff --git a/ace/DLL.h b/ace/DLL.h index 361214fd551..59336ff0c24 100644 --- a/ace/DLL.h +++ b/ace/DLL.h @@ -42,7 +42,7 @@ public: // Default constructor. By default, the <close> operation on the // object will be invoked before it is destroyed. - ACE_DLL (const char *dll_name, + ACE_DLL (const ASYS_TCHAR *dll_name, int open_mode = ACE_DEFAULT_SHLIB_MODE, int close_on_destruction = 1); // This constructor opens and dynamically links <dll_name>. The @@ -53,7 +53,7 @@ public: // loaded and <RTLD_GLOBAL>, which makes symbols available for // relocation processing of any other DLLs. - int open (const char *dll_name, + int open (const ASYS_TCHAR *dll_name, int open_mode = ACE_DEFAULT_SHLIB_MODE, int close_on_destruction = 1); // This method opens and dynamically links <dll_name>. The default diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h index 92dfd2d606d..ea28b37efb4 100644 --- a/ace/INET_Addr.h +++ b/ace/INET_Addr.h @@ -61,13 +61,13 @@ public: ACE_INET_Addr (const ASYS_TCHAR port_name[], const ASYS_TCHAR host_name[], - const ASYS_TCHAR protocol[] = "tcp"); + const ASYS_TCHAR protocol[] = ASYS_TEXT ("tcp")); // Uses <getservbyname> to create an <ACE_INET_Addr> from a // <port_name>, the remote <host_name>, and the <protocol>. ACE_INET_Addr (const ASYS_TCHAR port_name[], ACE_UINT32 ip_addr, - const ASYS_TCHAR protocol[] = "tcp"); + const ASYS_TCHAR protocol[] = ASYS_TEXT ("tcp")); // Uses <getservbyname> to create an <ACE_INET_Addr> from a // <port_name>, an Internet <ip_addr>, and the <protocol>. This // method assumes that <ip_addr> is in host byte order. @@ -101,13 +101,13 @@ public: int set (const ASYS_TCHAR port_name[], const ASYS_TCHAR host_name[], - const ASYS_TCHAR protocol[] = "tcp"); + const ASYS_TCHAR protocol[] = ASYS_TEXT ("tcp")); // Uses <getservbyname> to initialize an <ACE_INET_Addr> from a // <port_name>, the remote <host_name>, and the <protocol>. int set (const ASYS_TCHAR port_name[], ACE_UINT32 ip_addr, - const ASYS_TCHAR protocol[] = "tcp"); + const ASYS_TCHAR protocol[] = ASYS_TEXT ("tcp")); // Uses <getservbyname> to initialize an <ACE_INET_Addr> from a // <port_name>, an <ip_addr>, and the <protocol>. This assumes that // <ip_addr> is already in network byte order. @@ -119,7 +119,7 @@ public: // is assumed to be a port number, with the IP address being // INADDR_ANY. - int set (const sockaddr_in *, + int set (const sockaddr_in *, int len); // Creates an <ACE_INET_Addr> from a sockaddr_in structure. @@ -129,7 +129,7 @@ public: virtual void set_addr (void *, int len); // Set a pointer to the address. - virtual int addr_to_string (ASYS_TCHAR buffer[], + virtual int addr_to_string (ASYS_TCHAR buffer[], size_t size, int ipaddr_format = 1) const; // Transform the current <ACE_INET_Addr> address into string format. diff --git a/ace/OS.cpp b/ace/OS.cpp index 21413d0c7b9..1b6802b3a81 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -6877,23 +6877,6 @@ ACE_CE_Bridge::ACE_CE_Bridge (void) { } -# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) -ACE_CE_Bridge::ACE_CE_Bridge (CWnd *w, int n, int i) - : text_output_ (w->m_hWnd), - notification_ (n), - idc_ (i) -{ -} - -void -ACE_CE_Bridge::set_window (CWnd *w, int n, int i) -{ - this->text_output_ = w->m_hWnd; - this->notification_ = n; - this->idc_ = i; -} -# endif /* ACE_HAS_MFC && ACE_HAS_MFC != 0 */ - ACE_CE_Bridge::ACE_CE_Bridge (HWND w, int n, int i) : text_output_ (w), notification_ (n), @@ -5150,7 +5150,7 @@ struct ACE_Protocol_Info #define ACE_QOS_NOT_SPECIFIED 0xFFFFFFFF #define ACE_SERVICETYPE_NOTRAFFIC 0x00000000 // No data in this direction. -#define ACE_SERVICETYPE_CONTROLLEDLOAD 0x00000002 // Controlled Load. +#define ACE_SERVICETYPE_CONTROLLEDLOAD 0x00000002 // Controlled Load. #define ACE_SERVICETYPE_GUARANTEED 0x00000003 // Guaranteed. #define ACE_JL_SENDER_ONLY 0x01 @@ -7927,22 +7927,12 @@ public: ACE_CE_Bridge (void); // Default ctor. -# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) - ACE_CE_Bridge (CWnd *, int notification, int idc); - // Construct and set the default windows. -# endif /* ACE_HAS_MFC && ACE_HAS_MFC != 0 */ - ACE_CE_Bridge (HWND, int notification, int idc); // Construct and set the default windows. ~ACE_CE_Bridge (void); // Default dtor. -# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) - void set_window (CWnd *, int notification, int idc); - // Specify which window to use. -# endif /* ACE_HAS_MFC && ACE_HAS_MFC != 0 */ - void set_window (HWND, int notification, int idc); // Specify which window to use. diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h index b2f29af184b..3a416045139 100644 --- a/ace/config-WinCE.h +++ b/ace/config-WinCE.h @@ -25,10 +25,10 @@ #define ACE_HAS_WINNT4 0 // You must use MFC with ACE on CE. -// #if defined (ACE_HAS_MFC) -// # undef ACE_HAS_MFC -// #endif /* ACE_HAS_MFC */ -// #define ACE_HAS_MFC 1 +#if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) +# undef ACE_HAS_MFC +#endif /* ACE_HAS_MFC */ +#define ACE_HAS_MFC 1 // So is UNICODE. #if defined (ACE_HAS_UNICODE) |