Avoid leaving return types or function attributes on their own lines.

6 files changed, 9 insertions, 20 deletions

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 5537eb481..4aebc2078 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -104,8 +104,7 @@ Value ValueFromAmount(int64 amount)
     return (double)amount / (double)COIN;
 }
 
-std::string
-HexBits(unsigned int nBits)
+std::string HexBits(unsigned int nBits)
 {
     union {
         int32_t nBits;
diff --git a/src/main.cpp b/src/main.cpp
index 91aba149b..56596ef18 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -653,8 +653,7 @@ bool CTxMemPool::remove(CTransaction &tx)
     return true;
 }
 
-void
-CTxMemPool::clear()
+void CTxMemPool::clear()
 {
     LOCK(cs);
     mapTx.clear();
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index fefefc7d6..2430a0387 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -18,8 +18,7 @@ using namespace boost;
 using namespace boost::assign;
 using namespace json_spirit;
 
-void
-ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out)
+void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out)
 {
     txnouttype type;
     vector<CTxDestination> addresses;
@@ -43,8 +42,7 @@ ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out)
     out.push_back(Pair("addresses", a));
 }
 
-void
-TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)
+void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)
 {
     entry.push_back(Pair("txid", tx.GetHash().GetHex()));
     entry.push_back(Pair("version", tx.nVersion));
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 95fa6718d..2e284b07d 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -15,16 +15,14 @@ using namespace std;
 int64 nWalletUnlockTime;
 static CCriticalSection cs_nWalletUnlockTime;
 
-std::string
-HelpRequiringPassphrase()
+std::string HelpRequiringPassphrase()
 {
     return pwalletMain->IsCrypted()
         ? "\nrequires wallet passphrase to be set with walletpassphrase first"
         : "";
 }
 
-void
-EnsureWalletIsUnlocked()
+void EnsureWalletIsUnlocked()
 {
     if (pwalletMain->IsLocked())
         throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
diff --git a/src/script.cpp b/src/script.cpp
index 8c35f0eed..c34fbec82 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1127,8 +1127,7 @@ public:
         return false;
     }
 
-    void
-    Set(uint256 hash, const std::vector<unsigned char>& vchSig, const std::vector<unsigned char>& pubKey)
+    void Set(uint256 hash, const std::vector<unsigned char>& vchSig, const std::vector<unsigned char>& pubKey)
     {
         // DoS prevention: limit cache size to less than 10MB
         // (~200 bytes per cache entry times 50,000 entries)
diff --git a/src/wallet.h b/src/wallet.h
index 69badaf10..720527971 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -319,9 +319,7 @@ public:
 typedef std::map<std::string, std::string> mapValue_t;
 
 
-static
-void
-ReadOrderPos(int64& nOrderPos, mapValue_t& mapValue)
+static void ReadOrderPos(int64& nOrderPos, mapValue_t& mapValue)
 {
     if (!mapValue.count("n"))
     {
@@ -332,9 +330,7 @@ ReadOrderPos(int64& nOrderPos, mapValue_t& mapValue)
 }
 
 
-static
-void
-WriteOrderPos(const int64& nOrderPos, mapValue_t& mapValue)
+static void WriteOrderPos(const int64& nOrderPos, mapValue_t& mapValue)
 {
     if (nOrderPos == -1)
         return;