Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

use nullptr instead of NULL

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-08 16:39:17 +02:00
parent 15a95ff425
commit abe9c4d53c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Extractor/PBFParser.cpp
View File

@ -44,6 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/ref.hpp> #include <boost/ref.hpp>
#include <boost/thread.hpp>
#include <zlib.h> #include <zlib.h>
@ -69,6 +70,8 @@ PBFParser::PBFParser(
} }
PBFParser::~PBFParser() { PBFParser::~PBFParser() {
SimpleLogger().Write(logDEBUG) << "d'tor pbf";
if(input.is_open()) { if(input.is_open()) {
input.close(); input.close();
} }
@ -130,7 +133,7 @@ inline void PBFParser::ReadData() {
if (keepRunning) { if (keepRunning) {
threadDataQueue->push(threadData); threadDataQueue->push(threadData);
} else { } else {
threadDataQueue->push(NULL); // No more data to read, parse stops when NULL encountered threadDataQueue->push(nullptr); // No more data to read, parse stops when nullptr encountered
delete threadData; delete threadData;
} }
} while(keepRunning); } while(keepRunning);
@ -140,9 +143,8 @@ inline void PBFParser::ParseData() {
while (true) { while (true) {
_ThreadData *threadData; _ThreadData *threadData;
threadDataQueue->wait_and_pop(threadData); threadDataQueue->wait_and_pop(threadData);
if( NULL==threadData ) { if( nullptr==threadData ) {
SimpleLogger().Write() << "Parse Data Thread Finished"; threadDataQueue->push(nullptr); // Signal end of data for other threads
threadDataQueue->push(NULL); // Signal end of data for other threads
break; break;
} }