diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-17 23:49:47 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-17 23:49:47 +0000 |
| commit | ce52e85528d54ce91c3b155f2751895f34dc1ea3 (patch) | |
| tree | b79de7edf7c1bfc1f551da29e3a510fe5780c12b /net/ftp | |
| parent | 21f527e6a4a812b604dd0891b27878d8418c04d9 (diff) | |
| download | chromium_src-ce52e85528d54ce91c3b155f2751895f34dc1ea3.zip chromium_src-ce52e85528d54ce91c3b155f2751895f34dc1ea3.tar.gz chromium_src-ce52e85528d54ce91c3b155f2751895f34dc1ea3.tar.bz2 | |
Fix Linux build.
Review URL: http://codereview.chromium.org/14818
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp')
| -rw-r--r-- | net/ftp/ftp_network_transaction.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc index ab146f0..f40a28d 100644 --- a/net/ftp/ftp_network_transaction.cc +++ b/net/ftp/ftp_network_transaction.cc @@ -4,6 +4,7 @@ #include "net/ftp/ftp_network_transaction.h" +#include "base/compiler_specific.h" #include "net/base/client_socket.h" #include "net/base/net_errors.h" #include "net/ftp/ftp_network_session.h" @@ -12,8 +13,8 @@ namespace net { FtpNetworkTransaction::FtpNetworkTransaction( FtpNetworkSession* session, ClientSocketFactory* socket_factory) -#pragma warning(suppress: 4355) - : io_callback_(this, &FtpNetworkTransaction::OnIOComplete), + : ALLOW_THIS_IN_INITIALIZER_LIST(io_callback_(this, + &FtpNetworkTransaction::OnIOComplete)), user_callback_(NULL), session_(session), socket_factory_(socket_factory), |