From b5a30a65ae8dbe95facf72ad65245050623d324b Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Wed, 3 Jun 2015 05:12:54 +0000
Subject: [PATCH] merged changes from RC_1_0

---
 include/libtorrent/bencode.hpp | 8 ++++----
 src/entry.cpp                  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/libtorrent/bencode.hpp b/include/libtorrent/bencode.hpp
index fb7138b8f..d5adf5115 100644
--- a/include/libtorrent/bencode.hpp
+++ b/include/libtorrent/bencode.hpp
@@ -241,11 +241,11 @@ namespace libtorrent
 			// integer
 			case 'i':
 				{
-				++in; // 'i' 
+				++in; // 'i'
 				std::string val = read_until(in, end, 'e', err);
 				if (err) return;
 				TORRENT_ASSERT(*in == 'e');
-				++in; // 'e' 
+				++in; // 'e'
 				ret = entry(entry::int_t);
 				char* end_pointer;
 				ret.integer() = strtoll(val.c_str(), &end_pointer, 10);
@@ -304,7 +304,7 @@ namespace libtorrent
 					entry key;
 					bdecode_recursive(in, end, key, err, depth + 1);
 					if (err || key.type() != entry::string_t)
-					{	
+					{
 #ifdef TORRENT_DEBUG
 						ret.m_type_queried = false;
 #endif
@@ -375,7 +375,7 @@ namespace libtorrent
 			}
 		}
 	}
-	
+
 	// These functions will encode data to bencoded or decode bencoded data.
 	// 
 	// If possible, ``bdecode()`` producing a bdecode_node should be preferred
diff --git a/src/entry.cpp b/src/entry.cpp
index 777cb8fd9..5181724e8 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -116,7 +116,7 @@ namespace libtorrent
 		if (i == dict().end()) return 0;
 		return &i->second;
 	}
-	
+
 	entry* entry::find_key(std::string const& key)
 	{
 		dictionary_type::iterator i = dict().find(key);
@@ -130,7 +130,7 @@ namespace libtorrent
 		if (i == dict().end()) return 0;
 		return &i->second;
 	}
-	
+
 #ifndef BOOST_NO_EXCEPTIONS
 	const entry& entry::operator[](char const* key) const
 	{