Merge #9538: [util] Remove redundant call to get() on smart pointer (thread_specific_ptr)

laanwj · laanwj · commit e3e7db829ecd · 2017-03-09T10:33:28.000+01:00
53a2ba3 [util] Remove redundant call to get() on smart pointer (thread_specific_ptr) (practicalswift) Tree-SHA512: ec8ace4218ae0657d1aaf8ba7682b0cdd140fe0844173058d3cbf4575dee8d9ad5f241e5bacf1e9e4ad3f7dd282f56a8cb0f306de2093f2c0f6333daedd58261
diff --git a/src/util.cpp b/src/util.cpp
@@ -248,7 +248,7 @@ bool LogAcceptCategory(const char* category)
             } else
                 ptrCategory.reset(new std::set<std::string>());
         }
-        const std::set<std::string>& setCategories = *ptrCategory.get();
+        const std::set<std::string>& setCategories = *ptrCategory;
 
         // if not debugging everything and not debugging specific category, LogPrint does nothing.
         if (setCategories.count(std::string("")) == 0 &&
@@ -839,4 +839,4 @@ std::string CopyrightHolders(const std::string& strPrefix)
         strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";
     }
     return strCopyrightHolders;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ bool LogAcceptCategory(const char* category)`
`248`	`248`	`} else`
`249`	`249`	`ptrCategory.reset(new std::set<std::string>());`
`250`	`250`	`}`
`251`		`- const std::set<std::string>& setCategories = *ptrCategory.get();`
	`251`	`+ const std::set<std::string>& setCategories = *ptrCategory;`
`252`	`252`
`253`	`253`	`// if not debugging everything and not debugging specific category, LogPrint does nothing.`
`254`	`254`	`if (setCategories.count(std::string("")) == 0 &&`
`@@ -839,4 +839,4 @@ std::string CopyrightHolders(const std::string& strPrefix)`
`839`	`839`	`strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";`
`840`	`840`	`}`
`841`	`841`	`return strCopyrightHolders;`
`842`		`-}`
	`842`	`+}`