use lock_guard instead of unique_lock where possible

Author: dbahrdt

examples/filteredCount.cpp

@@ -68,7 +68,7 @@ struct MyCounter {
 			}
 		}
 		//now flush everything to shared state
-		std::unique_lock<std::mutex> lck(state->lock);
+		std::lock_guard<std::mutex> lck(state->lock);
 		state->nodeCount += nodeCount;
 		state->wayCount += wayCount;
 		state->relationCount += relationCount;

osmpbf/blobfile.cpp

@@ -402,7 +402,7 @@ bool BlobFileIn::skipBlob()
 	uint32_t blobLength;
 	BlobDataType blobDataType;
 
-	std::unique_lock<std::mutex> lck(m_fileLock);
+	std::lock_guard<std::mutex> lck(m_fileLock);
 	readBlobHeader(blobLength, blobDataType);
 	if (blobLength)
 	{

osmpbf/pbistream.cpp

@@ -131,7 +131,7 @@ MultiFilePbiStream::hasNext() const {
 
 bool
 MultiFilePbiStream::getNext(BlobDataBuffer & buffer) {
-	std::unique_lock<std::mutex> lck(m_lock);
+	std::lock_guard<std::mutex> lck(m_lock);
 	if (!hasNext()) {
 		return false;
 	}
@@ -148,7 +148,7 @@ MultiFilePbiStream::getNext(BlobDataBuffer & buffer) {
 
 bool
 MultiFilePbiStream::getNext(osmpbf::BlobDataMultiBuffer & buffers, int num) {
-	std::unique_lock<std::mutex> lck(m_lock);
+	std::lock_guard<std::mutex> lck(m_lock);
 	osmpbf::BlobDataMultiBuffer tmpBuffer;
 	if (num < 0) {
 		num = std::numeric_limits<int>::max();
@@ -180,7 +180,7 @@ MultiFilePbiStream::getNext(osmpbf::BlobDataMultiBuffer & buffers, int num) {
 
 bool
 MultiFilePbiStream::parseNext(PrimitiveBlockInputAdaptor& adaptor) {
-	std::unique_lock<std::mutex> lck(m_lock);
+	std::lock_guard<std::mutex> lck(m_lock);
 	if (!hasNext()) {
 		return false;
 	}