summaryrefslogtreecommitdiff
path: root/ACE/ace/Local_Tokens.cpp
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-03-09 01:07:44 +0000
committerSteve Huston <shuston@riverace.com>2007-03-09 01:07:44 +0000
commita61714cf83a43552d74232bec6bf2965868142de (patch)
tree6553cb506c511a771a9aac20cc6ff91643494aaf /ACE/ace/Local_Tokens.cpp
parentacc13c6e0ae9f31dd5895864c7fe76bbc2a6f2f6 (diff)
downloadATCD-a61714cf83a43552d74232bec6bf2965868142de.tar.gz
ChangeLogTag:Fri Mar 9 00:53:43 UTC 2007 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/Local_Tokens.cpp')
-rw-r--r--ACE/ace/Local_Tokens.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp
index dc8dec8d85f..d8317df464c 100644
--- a/ACE/ace/Local_Tokens.cpp
+++ b/ACE/ace/Local_Tokens.cpp
@@ -1141,6 +1141,10 @@ ACE_Token_Proxy::name (void) const
return this->token_->name ();
}
+#if defined (ACE_WIN32_VC8)
+# pragma warning (push)
+# pragma warning (disable:4355) /* Use of 'this' in initializer list */
+#endif
ACE_Token_Proxy::ACE_Token_Proxy (void)
: token_ (0),
waiter_ (this, 0)
@@ -1158,6 +1162,9 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &)
{
ACE_TRACE ("ACE_Token_Proxy::ACE_Token_Proxy");
}
+#if defined (ACE_WIN32_VC8)
+# pragma warning (pop)
+#endif
// @@ should I do a mutex_->release ()?
ACE_Token_Proxy::~ACE_Token_Proxy (void)