Stuff memory holes

Padding changes on x86_64:
- RequestGroup: 29 -> 5 bytes
- DownloadContext:  25 -> 1 bytes
- Cookie: 20 -> 4 bytes
- Command: 8 -> 0 bytes (affects many derived as well)
- HttpRequest: 20 -> 4 bytes
- DownloadCommand: 18 -> 2 bytes
- TimeBasedCommand: 14 -> 6 bytes
- AbstractCommand: 13 -> 5 bytes
- HttpSkipResponseCommand: 12 -> 4 bytes
- FileEntry: 10 -> 2 bytes
- DownloadResult: 15 -> 7 bytes
- UriStruct: 12 -> 4 bytes
- Piece: 11 -> 3 bytes
- BitfieldMan -> 11 -> 3 bytes

1 files changed, 3 insertions, 3 deletions

diff --git a/src/uri.cc b/src/uri.cc
index 433afa4e..d7742fee 100644
--- a/src/uri.cc
+++ b/src/uri.cc
@@ -48,12 +48,12 @@ UriStruct::UriStruct()
 UriStruct::UriStruct(const UriStruct& c)
   : protocol(c.protocol),
     host(c.host),
-    port(c.port),
     dir(c.dir),
     file(c.file),
     query(c.query),
     username(c.username),
     password(c.password),
+    port(c.port),
     hasPassword(c.hasPassword),
     ipv6LiteralAddress(c.ipv6LiteralAddress)
 {}
@@ -65,12 +65,12 @@ UriStruct& UriStruct::operator=(const UriStruct& c)
   if(this != &c) {
     protocol = c.protocol;
     host = c.host;
-    port = c.port;
     dir = c.dir;
     file = c.file;
     query = c.query;
     username = c.username;
     password = c.password;
+    port = c.port;
     hasPassword = c.hasPassword;
     ipv6LiteralAddress = c.ipv6LiteralAddress;
   }
@@ -83,12 +83,12 @@ void UriStruct::swap(UriStruct& other)
   if(this != &other) {
     swap(protocol, other.protocol);
     swap(host, other.host);
-    swap(port, other.port);
     swap(dir, other.dir);
     swap(file, other.file);
     swap(query, other.query);
     swap(username, other.username);
     swap(password, other.password);
+    swap(port, other.port);
     swap(hasPassword, other.hasPassword);
     swap(ipv6LiteralAddress, other.ipv6LiteralAddress);
   }