[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.

[mikeperry at torproject.org]

commit 3b7305457124de7d7fee52d3bd3e3fa1ca5f62e5
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon May 4 18:30:06 2015 +0200

    fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.
    
    Fix reorder build error:
    
    ../../../dist/include/mozilla/net/HttpBaseChannel.h:339:11: error: 'mozilla::net::HttpBaseChannel::mRedirectCount' will be initialized after [-Werror=reorder]
    ../../../dist/include/mozilla/net/HttpBaseChannel.h:327:20: error: 'nsCOMPtr<nsIURI> mozilla::net::HttpBaseChannel::mProxyURI' [-Werror=reorder]
    /builds/slave/try-l64-d-00000000000000000000/build/src/netwerk/protocol/http/HttpBaseChannel.cpp:39:1: error: when initialized here [-Werror=reorder]
---
 netwerk/protocol/http/HttpBaseChannel.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index 64b202a..17f8c72 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -65,10 +65,10 @@ HttpBaseChannel::HttpBaseChannel()
   , mAllRedirectsSameOrigin(true)
   , mSuspendCount(0)
   , mProxyResolveFlags(0)
+  , mProxyURI(nullptr)
   , mContentDispositionHint(UINT32_MAX)
   , mHttpHandler(gHttpHandler)
   , mRedirectCount(0)
-  , mProxyURI(nullptr)
 {
   LOG(("Creating HttpBaseChannel @%x\n", this));