summaryrefslogtreecommitdiff
path: root/ACE/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/protocols')
-rw-r--r--ACE/protocols/ace/INet/AuthenticationBase.cpp12
-rw-r--r--ACE/protocols/ace/INet/AuthenticationBase.h3
-rw-r--r--ACE/protocols/ace/INet/ConnectionCache.h4
-rw-r--r--ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp2
-rw-r--r--ACE/protocols/ace/INet/FTP_URL.cpp6
-rw-r--r--ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp2
-rw-r--r--ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h4
-rw-r--r--ACE/protocols/ace/INet/HTTP_URL.cpp8
-rw-r--r--ACE/protocols/ace/INet/HeaderBase.h14
-rw-r--r--ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp2
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)));
View Lorry Controller Status