diff options
| -rw-r--r-- | src/json/json_spirit_reader_template.h | 12 | ||||
| -rw-r--r-- | src/net.cpp | 4 | ||||
| -rw-r--r-- | src/qt/transactionfilterproxy.h | 2 | ||||
| -rw-r--r-- | src/util.h | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/json/json_spirit_reader_template.h b/src/json/json_spirit_reader_template.h index 4dec00e6c9..12d1e7919f 100644 --- a/src/json/json_spirit_reader_template.h +++ b/src/json/json_spirit_reader_template.h @@ -380,32 +380,32 @@ namespace json_spirit static void throw_not_value( Iter_type begin, Iter_type end ) { - throw_error( begin, "not a value" ); + throw_error( begin, "not a value" ); } static void throw_not_array( Iter_type begin, Iter_type end ) { - throw_error( begin, "not an array" ); + throw_error( begin, "not an array" ); } static void throw_not_object( Iter_type begin, Iter_type end ) { - throw_error( begin, "not an object" ); + throw_error( begin, "not an object" ); } static void throw_not_pair( Iter_type begin, Iter_type end ) { - throw_error( begin, "not a pair" ); + throw_error( begin, "not a pair" ); } static void throw_not_colon( Iter_type begin, Iter_type end ) { - throw_error( begin, "no colon in pair" ); + throw_error( begin, "no colon in pair" ); } static void throw_not_string( Iter_type begin, Iter_type end ) { - throw_error( begin, "not a string" ); + throw_error( begin, "not a string" ); } template< typename ScannerT > diff --git a/src/net.cpp b/src/net.cpp index b91a8f69c6..5aaa682131 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -969,11 +969,11 @@ void ThreadMapPort2(void* parg) #ifndef UPNPDISCOVER_SUCCESS /* miniupnpc 1.5 */ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - port, port, lanaddr, strDesc.c_str(), "TCP", 0); + port, port, lanaddr, strDesc.c_str(), "TCP", 0); #else /* miniupnpc 1.6 */ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - port, port, lanaddr, strDesc.c_str(), "TCP", 0, "0"); + port, port, lanaddr, strDesc.c_str(), "TCP", 0, "0"); #endif if(r!=UPNPCOMMAND_SUCCESS) diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h index 76cf46f156..8d6829d6f0 100644 --- a/src/qt/transactionfilterproxy.h +++ b/src/qt/transactionfilterproxy.h @@ -31,7 +31,7 @@ public: /** Set maximum number of rows returned, -1 if unlimited. */ void setLimit(int limit); - int rowCount(const QModelIndex &parent = QModelIndex()) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const; protected: bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const; diff --git a/src/util.h b/src/util.h index 87725b7217..19f06521ef 100644 --- a/src/util.h +++ b/src/util.h @@ -716,8 +716,8 @@ inline bool AffinityBugWorkaround(void(*pfn)(void*)) inline uint32_t ByteReverse(uint32_t value) { - value = ((value & 0xFF00FF00) >> 8) | ((value & 0x00FF00FF) << 8); - return (value<<16) | (value>>16); + value = ((value & 0xFF00FF00) >> 8) | ((value & 0x00FF00FF) << 8); + return (value<<16) | (value>>16); } #endif |