diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-08-07 07:10:20 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-08-07 07:10:20 +0000 |
commit | d884ff87f199ac1b30e214cc1bfae94a7108f1bd (patch) | |
tree | 25b69c881029169c7ada3a29fe6b6174f6f6070b /ACE/protocols | |
parent | f52e99527d0ca115f90561aed98fa5a6eb8f9c46 (diff) | |
download | ATCD-d884ff87f199ac1b30e214cc1bfae94a7108f1bd.tar.gz |
Wed Aug 7 07:02:52 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ACE-INSTALL.html:
* ASNMP/asnmp/address.cpp:
* ASNMP/asnmp/asn1.cpp:
* ASNMP/asnmp/snmp.h:
* ASNMP/asnmp/snmp.cpp:
* ace/Asynch_IO.h:
* ace/Connection_Recycling_Strategy.h:
* ace/Connection_Recycling_Strategy.cpp:
* ace/ETCL/ETCL_Constraint_Visitor.h:
* ace/ETCL/ETCL_Constraint_Visitor.cpp:
* ace/FIFO_Recv_Msg.inl:
* ace/Log_Msg_Callback.h:
* ace/Log_Msg_Callback.cpp:
* ace/Monitor_Control/Auto_Update_Starter.h:
* ace/Monitor_Control/Auto_Update_Starter.cpp:
* ace/Monitor_Control/Monitor_Query.h:
* ace/Monitor_Control/Monitor_Query.cpp:
* ace/OS_NS_Thread.cpp:
* ace/OS_NS_signal.h:
* ace/OS_NS_signal.cpp:
* ace/OS_NS_stdio.cpp:
* ace/Select_Reactor_Base.cpp:
* ace/Sig_Handler.h:
* ace/Sig_Handler.cpp:
* ace/TTY_IO.h:
* ace/TTY_IO.cpp:
* ace/Thread_Hook.h:
* ace/Thread_Hook.cpp:
* ace/config-macros.h:
* ace/config-win32-borland.h:
* ace/config-win32-common.h:
* ace/config-win32.h:
* apps/Gateway/Peer/Peer.cpp:
* bin/MakeProjectCreator/config/bmake.features:
* examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp:
* examples/NT_Service/main.cpp:
* examples/Reactor/TP_Reactor/ReadHandler.cpp:
* examples/Reactor/TP_Reactor/client.cpp:
* examples/Timer_Queue/Custom_Handler.h:
* examples/Timer_Queue/main_thread_custom_handler.cpp:
* performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp:
* protocols/ace/INet/AuthenticationBase.h:
* protocols/ace/INet/AuthenticationBase.cpp:
* protocols/ace/INet/ConnectionCache.h:
* protocols/ace/INet/FTP_ClientRequestHandler.cpp:
* protocols/ace/INet/FTP_URL.cpp:
* protocols/ace/INet/HTTP_ClientRequestHandler.h:
* protocols/ace/INet/HTTP_ClientRequestHandler.cpp:
* protocols/ace/INet/HTTP_URL.cpp:
* protocols/ace/INet/HeaderBase.h:
* protocols/examples/RMCast/Send_Msg/Receiver.cpp:
* tests/Bug_2434_Regression_Test.cpp:
* tests/Bug_2772_Regression_Test.cpp:
* tests/Capabilities_Test.cpp:
* tests/DLL_Test.h:
* tests/DLL_Test_Impl.cpp:
* tests/Logging_Strategy_Test.cpp:
* tests/Process_Env_Test.cpp:
* tests/Process_Strategy_Test.cpp:
* tests/Reactor_Timer_Test.cpp:
* tests/SOCK_Send_Recv_Test.cpp:
* tests/test_config.h:
Revived port for Embarcadero C++ Builder XE4 using bcc32
commit b8e06cf020879fa8aa8cf3158601a19ea8bc44d4
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jun 28 19:38:10 2013 +0200
Layout
* ACE/tests/Bug_2434_Regression_Test.cpp:
* ACE/tests/Bug_2772_Regression_Test.cpp:
commit ee6893a5065cbe56df7e4ab5aae31971ddf0edf3
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jun 28 19:34:00 2013 +0200
Updated borland instructions
* ACE/ACE-INSTALL.html:
commit 1ac4a32bb448852cf8c1f2fa90d6b14f1fd2d339
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jun 28 19:28:01 2013 +0200
Fix conversion warnings for bcc32:
* ACE/apps/Gateway/Peer/Peer.cpp:
* ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp:
* ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp:
* ACE/examples/Reactor/TP_Reactor/client.cpp:
commit b873f90c6801dde85f9fc6538a656f8400d4b8b3
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jun 28 09:02:36 2013 +0200
Fixed typo
* ACE/tests/Reactor_Timer_Test.cpp:
commit 4ffd49852005a058ddd7540e101348f1f58db506
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu Jun 27 14:41:32 2013 +0200
Fixed bcc32 signed/unsigned comparison warnings
* ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp:
* ACE/tests/Capabilities_Test.cpp:
* ACE/tests/Process_Strategy_Test.cpp:
* ACE/tests/Reactor_Timer_Test.cpp:
* ACE/tests/SOCK_Send_Recv_Test.cpp:
commit 604b6c22cc21a64be12bbca4da68ce90f63b4d56
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu Jun 27 13:01:30 2013 +0200
Fixed conversion warnings with bcc32
* ACE/ASNMP/asnmp/address.cpp:
* ACE/ASNMP/asnmp/asn1.cpp:
* ACE/ace/FIFO_Recv_Msg.inl:
commit c257a73968b54bcab543cb5f2f436f16a9d63df8
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu Jun 27 11:13:25 2013 +0200
Cleanup port
* ACE/ace/config-win32-borland.h:
commit a6dbc3fc51f6d3bb791b024c5e7aed2891a0f749
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 19:34:34 2013 +0200
Updated Embarcadero instructions
* ACE/ACE-INSTALL.html:
commit 476cdd82dcb899059e3f8c67858d4d383042e609
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 14:25:13 2013 +0200
Fixed bcc32 warning
* ACE/tests/Process_Strategy_Test.cpp:
commit 93e4a41e1954ff23a30d1b613e3d42a64ebcac10
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 14:18:51 2013 +0200
Extended size of environment usage to make sure we
are above 32k
* ACE/tests/Process_Env_Test.cpp:
commit 340fbaa2b557c7df56d8ecf8ce623837b4bccb54
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 13:58:19 2013 +0200
Added missing export
* ACE/protocols/ace/INet/HeaderBase.h:
Layout
* ACE/tests/Process_Env_Test.cpp:
commit e7bbccf459931996a3c8482f74736b08ab929093
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 13:26:39 2013 +0200
Added some casts to suppress bcc32 warnings
* ACE/ace/OS_NS_Thread.cpp:
* ACE/ace/Select_Reactor_Base.cpp:
commit a07353c126b24967c7a72c5fba6369a487f8515b
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 13:22:52 2013 +0200
Removed check
* ACE/ace/pre.h:
commit f17435f0745233504a01a52fd1dc76b45397504d
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 12:26:20 2013 +0200
Fixed compile errors with bcc32
* ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp:
* ACE/protocols/ace/INet/FTP_URL.cpp:
* ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp:
* ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h:
* ACE/protocols/ace/INet/HTTP_URL.cpp:
commit 305ed854f18ad958d593a94b1b51045ac8f01d5f
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 12:11:44 2013 +0200
bcb lacks localtime_r
* ACE/ace/config-win32-borland.h:
commit f7085b98b817695b633ffe2a1898523ff4e5677e
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 12:03:56 2013 +0200
Disable warning about static constructors
* ACE/ace/pre.h:
commit 0894d0797d66c9be6ab51ee68612c103f1b7a594
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 11:51:11 2013 +0200
Made check more generic
* ACE/tests/Logging_Strategy_Test.cpp:
commit 5b6354cd131be8ab244dfae4c9bcecccf46eaa74
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 10:10:44 2013 +0200
Fix for bcc64
* ACE/tests/Logging_Strategy_Test.cpp:
commit 4373010c606d004cc43685b19ad073e957be6518
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon Jun 24 12:03:45 2013 +0200
Layout changes
* ACE/tests/test_config.h:
commit f3c9a5cd86bb50ace420b5a72f8e03fe35c6d9b5
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu Jun 20 10:52:58 2013 +0200
Added support for ACE_HAS_CONSOLE_TEST_OUTPUT
* ACE/tests/test_config.h:
commit 2eadc63b624e91bf2bc3a68ee7627361e7c4c072
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed May 29 11:03:18 2013 +0200
Use 32bit preprocessor with cpp64 build
* ACE/ace/config-win32-borland.h:
commit fd1975d168c7cd7d7f26c6e097d6df4dfc56082d
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 21:50:34 2013 +0200
Attempt to fix bcc64 error
* ACE/examples/NT_Service/main.cpp:
commit d1988a65bc87098d5c13044bb7b7d7fb8e3c2271
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 21:32:27 2013 +0200
Attempt to fix time_t problems
* ACE/ace/config-win32-borland.h:
commit f2982ed3371cbe38528105b28532bbd56b60a29e
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 19:22:06 2013 +0200
Reverted change for other export macros
* ACE/ace/config-win32-borland.h:
commit 811d190e619b89fdf9478034f92dc5af28fcc69f
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 19:11:54 2013 +0200
Try regular export macros with bcb
* ACE/ace/config-win32-borland.h:
* ACE/ace/config-win32-common.h:
commit 1f8bf7e55140105a36aaf6fb0c689009c05b696e
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 16:14:48 2013 +0200
Default constructor
* ACE/protocols/ace/INet/AuthenticationBase.cpp:
* ACE/protocols/ace/INet/AuthenticationBase.h:
commit 201d7f17557a32477b8c02c74396ef092a4fc953
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 15:53:01 2013 +0200
Default constructor
* ACE/ace/Monitor_Control/Monitor_Query.cpp:
* ACE/ace/Monitor_Control/Monitor_Query.h:
* ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp:
commit ba8d2a24dade17fe0bfa69c86127b00bc5ff6000
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 13:47:43 2013 +0200
Default constructor
* ACE/ace/TTY_IO.cpp:
* ACE/ace/TTY_IO.h:
commit 2d9fb952d66ac6527794f3091115a6b1b2d82b58
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 13:46:33 2013 +0200
Default constructot
* ACE/ace/Connection_Recycling_Strategy.cpp:
* ACE/ace/Connection_Recycling_Strategy.h:
commit e1629f8efa132812267365371e83f0cc6da52842
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 13:44:45 2013 +0200
Added default constructor
* ACE/ace/Monitor_Control/Auto_Update_Starter.cpp:
* ACE/ace/Monitor_Control/Auto_Update_Starter.h:
commit eca2f470d4671100c1fedfa1a14fa3dc4ac2dda6
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 13:37:59 2013 +0200
Let us see what happens if we don't use a prefix
underscore for symbols
* ACE/ace/config-win32-borland.h:
commit a596f6fed12afde29d4847af99c0dde85dcf35ee
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:57:24 2013 +0200
Default constructor
* ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp:
commit 8dfb772c0d63996f2f5c0c9e8a02966cebc9665e
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:55:50 2013 +0200
Add default constructor
* ACE/tests/DLL_Test.h:
* ACE/tests/DLL_Test_Impl.cpp:
commit ab80db0e78d4cdaca365fa2a4b7af2745629da0f
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:53:51 2013 +0200
Default constructor
* ACE/ace/Thread_Hook.cpp:
* ACE/ace/Thread_Hook.h:
commit 2143f2e2b51e0e379eff498b85958434ff6e68fc
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:49:44 2013 +0200
Long double change for 64bit
* ACE/ace/config-win32-borland.h:
commit cd44c9fbf676714211d1016d8def0f0ffead14c1
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:46:56 2013 +0200
Added default constructors
* ACE/ace/Log_Msg_Callback.cpp:
* ACE/ace/Log_Msg_Callback.h:
* ACE/ace/Sig_Handler.cpp:
* ACE/ace/Sig_Handler.h:
commit 19184dcab928edfd22dce7008ab141534b56f2cd
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 10:44:32 2013 +0200
Added empty constructor to fix bcc64 link errors
* ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp:
* ACE/ace/ETCL/ETCL_Constraint_Visitor.h:
commit 2e55eedf63d1e9a7b82c488f2bd0716a2d88078b
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 10:43:12 2013 +0200
Added explicit constructor to resolve bcc64 link
problems
* ACE/ASNMP/asnmp/snmp.cpp:
* ACE/ASNMP/asnmp/snmp.h:
commit d1f85d331af335064b4b40d55e469487ce8c36ad
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 10:40:19 2013 +0200
clang based compiler has a problem with swab, let
us emulate it in ACE for the moment
* ACE/ace/config-win32-borland.h:
* ACE/protocols/ace/INet/ConnectionCache.h:
Doxygen fix
commit cec571985b60322fef6a0c613927d3fab9ae8fdf
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 09:14:36 2013 +0200
we have nonconst swab
* ACE/ace/config-win32-borland.h:
commit bb9dba4eb5005cb111a6b2cad60c94b8029dd616
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 09:07:50 2013 +0200
Zap older compiler support, handle different
preprocessor
for clang environment
* ACE/ace/config-win32-borland.h:
commit 7bcf63e19497aad971f0eb75ed6dfa504a8d4419
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 09:05:46 2013 +0200
Make unimplemented methods private
* ACE/ace/Asynch_IO.h:
commit 83333a374d3cafc4ea296c6bb419dfd2ecf2a580
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 08:40:52 2013 +0200
Added macro to try to resolve link errors
* ACE/ace/config-win32-borland.h:
commit d342c02695a6f74e95cc61446ed519de42a6815c
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 19:30:41 2013 +0200
Removed array of handles as part of siginfo_t,
triggers
warning with bcc64 and doesn't seem to be used at
all
* ACE/ace/OS_NS_signal.cpp:
* ACE/ace/OS_NS_signal.h:
commit 9e8926669d68a902196a7a4a474c70ad009a05e7
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 18:10:46 2013 +0200
Fix for localtime_r
* ACE/ace/config-win32-borland.h:
commit a59c969d36d8eb4ca6311bafeab4c653bc0475b6
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 16:51:17 2013 +0200
Attempt to fix argument unused warnings
* ACE/ace/config-macros.h:
commit fdf91a5679222a618a8eca419310ea83a4470573
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 12:53:26 2013 +0200
Fixes for bcc32
* ACE/examples/Timer_Queue/Custom_Handler.h:
* ACE/examples/Timer_Queue/main_thread_custom_handler.cpp:
commit 6799802f3d30139f586894debb2d41680bf78085
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 11:32:01 2013 +0200
New file for bmake
* ACE/bin/MakeProjectCreator/config/bmake.features:
Added.
commit c08478508b066069b412391d17f2ee5905f96da0
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 11:17:45 2013 +0200
Fixes for C++BuilderXE4
* ACE/ace/config-win32-borland.h:
commit cb17ce9c8760b274a669ceb9246d0ae3e4229dc0
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Aug 17 13:40:38 2012 +0200
* ACE/ace/OS_NS_stdio.cpp:
Fixed for bcc32
commit 83b5446de5dab9a967da424368170818f7fe78c7
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jul 27 13:37:55 2012 +0200
* ACE/ace/config-win32-borland.h:
* ACE/ace/config-win32.h:
Added some old files back
Diffstat (limited to 'ACE/protocols')
-rw-r--r-- | ACE/protocols/ace/INet/AuthenticationBase.cpp | 12 | ||||
-rw-r--r-- | ACE/protocols/ace/INet/AuthenticationBase.h | 3 | ||||
-rw-r--r-- | ACE/protocols/ace/INet/ConnectionCache.h | 4 | ||||
-rw-r--r-- | ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp | 2 | ||||
-rw-r--r-- | ACE/protocols/ace/INet/FTP_URL.cpp | 6 | ||||
-rw-r--r-- | ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp | 2 | ||||
-rw-r--r-- | ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h | 4 | ||||
-rw-r--r-- | ACE/protocols/ace/INet/HTTP_URL.cpp | 8 | ||||
-rw-r--r-- | ACE/protocols/ace/INet/HeaderBase.h | 14 | ||||
-rw-r--r-- | ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp | 2 |
10 files changed, 34 insertions, 23 deletions
diff --git a/ACE/protocols/ace/INet/AuthenticationBase.cpp b/ACE/protocols/ace/INet/AuthenticationBase.cpp index 735a94cd7bb..c2c0953b4f1 100644 --- a/ACE/protocols/ace/INet/AuthenticationBase.cpp +++ b/ACE/protocols/ace/INet/AuthenticationBase.cpp @@ -12,9 +12,17 @@ namespace ACE { namespace INet { - AuthenticationBase::~AuthenticationBase () {} + AuthenticationBase::~AuthenticationBase () + { + } - AuthenticatorBase::~AuthenticatorBase () {} + AuthenticatorBase::AuthenticatorBase () + { + } + + AuthenticatorBase::~AuthenticatorBase () + { + } } } diff --git a/ACE/protocols/ace/INet/AuthenticationBase.h b/ACE/protocols/ace/INet/AuthenticationBase.h index 45675f4a553..04e216aeb88 100644 --- a/ACE/protocols/ace/INet/AuthenticationBase.h +++ b/ACE/protocols/ace/INet/AuthenticationBase.h @@ -65,6 +65,9 @@ namespace ACE class ACE_INET_Export AuthenticatorBase { public: + /// Default constructor + AuthenticatorBase (); + /// Destructor virtual ~AuthenticatorBase (); diff --git a/ACE/protocols/ace/INet/ConnectionCache.h b/ACE/protocols/ace/INet/ConnectionCache.h index 0776fe295da..05406ff2929 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.h +++ b/ACE/protocols/ace/INet/ConnectionCache.h @@ -237,14 +237,14 @@ namespace ACE const ConnectionCacheValue& cacheval); /// Attempts to claim an existing connection. - /// Returns true and sets <connection> if successful. + /// Returns true and sets @a connection if successful. /// Returns false otherwise. /// Does not wait when no connection available. bool claim_existing_connection(const ConnectionKey& key, connection_type*& connection, ConnectionCacheValue::State& state); - /// Looks up a matching cache entry for <key> and updates + /// Looks up a matching cache entry for @a key and updates /// <cacheval> with the entry state if found. /// Returns true if found, false otherwise. bool find_connection (const ConnectionKey& key, diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp index 1f9a8775f55..d8132cfbb8d 100644 --- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp @@ -68,7 +68,7 @@ namespace ACE const ACE_CString& realm, ACE_CString& user, ACE_CString& pw) - : AuthenticationBase (), + : ACE::INet::AuthenticationBase (), realm_ (realm), user_ (user), password_ (pw) diff --git a/ACE/protocols/ace/INet/FTP_URL.cpp b/ACE/protocols/ace/INet/FTP_URL.cpp index b6a8118a2d0..fa2cadbb20e 100644 --- a/ACE/protocols/ace/INet/FTP_URL.cpp +++ b/ACE/protocols/ace/INet/FTP_URL.cpp @@ -24,18 +24,18 @@ namespace ACE } URL::URL () - : URL_INetAuthBase (FTP_PORT) + : ACE::INet::URL_INetAuthBase (FTP_PORT) { } URL::URL (const ACE_CString& url_string) - : URL_INetAuthBase (FTP_PORT) + : ACE::INet::URL_INetAuthBase (FTP_PORT) { this->parse (url_string); } URL::URL (const URL& url) - : URL_INetAuthBase (0) + : ACE::INet::URL_INetAuthBase (0) { *this = url; } diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp index ade87052b37..c2cdda310da 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp @@ -154,7 +154,7 @@ namespace ACE ACE::INet::ConnectionKey* ClientRequestHandler::HttpConnectionKey::duplicate () const { - ConnectionKey* k = 0; + ACE::INet::ConnectionKey* k = 0; if (this->proxy_connection_) { ACE_NEW_RETURN (k, diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h index 16f5ca10832..1a8a0b61350 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h @@ -190,7 +190,7 @@ namespace ACE virtual u_long hash () const; - virtual ConnectionKey* duplicate () const; + virtual ACE::INet::ConnectionKey* duplicate () const; bool is_proxy_connection () const; @@ -199,7 +199,7 @@ namespace ACE u_short proxy_target_port () const; protected: - virtual bool equal (const ConnectionKey& key) const; + virtual bool equal (const ACE::INet::ConnectionKey& key) const; private: bool proxy_connection_; diff --git a/ACE/protocols/ace/INet/HTTP_URL.cpp b/ACE/protocols/ace/INet/HTTP_URL.cpp index 01498682691..3527fc15da2 100644 --- a/ACE/protocols/ace/INet/HTTP_URL.cpp +++ b/ACE/protocols/ace/INet/HTTP_URL.cpp @@ -24,26 +24,26 @@ namespace ACE } URL::URL () - : URL_INetAuthBase (HTTP_PORT), + : ACE::INet::URL_INetAuthBase (HTTP_PORT), proxy_port_ (HTTP_PROXY_PORT) { } URL::URL (const ACE_CString& url_string) - : URL_INetAuthBase (HTTP_PORT), + : ACE::INet::URL_INetAuthBase (HTTP_PORT), proxy_port_ (HTTP_PROXY_PORT) { this->parse (url_string); } URL::URL (const URL& url) - : URL_INetAuthBase (0) + : ACE::INet::URL_INetAuthBase (0) { *this = url; } URL::URL (u_short port) - : URL_INetAuthBase (port), + : ACE::INet::URL_INetAuthBase (port), proxy_port_ (HTTP_PROXY_PORT) { } diff --git a/ACE/protocols/ace/INet/HeaderBase.h b/ACE/protocols/ace/INet/HeaderBase.h index 5231ee24294..65d10b07e42 100644 --- a/ACE/protocols/ace/INet/HeaderBase.h +++ b/ACE/protocols/ace/INet/HeaderBase.h @@ -36,7 +36,7 @@ namespace ACE * @brief Name/Value pair holder class. * */ - class NVPair + class ACE_INET_Export NVPair { public: NVPair (); @@ -116,22 +116,22 @@ namespace ACE static const ACE_CString EMPTY; - /// Sets header <name> to <value>. Overwrites existing vaues. + /// Sets header @a name to @a value. Overwrites existing vaues. void set (const ACE_CString& name, const ACE_CString& value); - /// Adds header <name> with <value>. Allows duplicates. + /// Adds header @a name with @a value. Allows duplicates. void add (const ACE_CString& name, const ACE_CString& value); - /// Removes header <name> (first found). + /// Removes header @a name (first found). void remove (const ACE_CString& name); - /// Retrieves value for header <name> into <value> (first found). + /// Retrieves value for header @a name into @a value (first found). bool get (const ACE_CString& name, ACE_CString& value) const; - /// Returns true if a header <name> exists (1 or more), false otherwise. + /// Returns true if a header @a name exists (1 or more), false otherwise. bool has (const ACE_CString& name) const; - /// Retrieves values for all headers <name> into <values>. + /// Retrieves values for all headers @a name into @a values. void get_values (const ACE_CString& name, ACE_Array<ACE_CString>& values) const; protected: diff --git a/ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp b/ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp index c6378948fc8..90330b61973 100644 --- a/ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp +++ b/ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp @@ -84,7 +84,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) continue; } - if (s != sizeof (msg)) + if (s != (ssize_t) sizeof (msg)) { ACE_ERROR ((LM_ERROR, "unexpected message size %d, expected %d\n", s, sizeof (msg))); |