Commit 7f75caf1 authored by thillux's avatar thillux
Browse files

made sanitizer happy :)

parent 1fc179e6

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ configure_file(src/config/Defines.hpp.cmake 
#

# COMPILER OPTIONS

#

set(CMAKE_CXX_FLAGS "-g -Wall -Wextra -march=native -O3 -std=c++11")

set(CMAKE_CXX_FLAGS "-g -Wall -Wextra -Weffc++ -march=native -O3 -std=c++11 -fsanitize=address")

include_directories("${SRCDIR}" "${CMAKE_BINARY_DIR}/src" "/usr/local/include")

link_directories("/usr/local/lib")

src/config/CMDArgs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


#include "CMDArgs.hpp"



CMDArgs::CMDArgs(int argc, char** argv) : _desc("Allowed options"), kmlOutput(false), graphOutput(false) {

CMDArgs::CMDArgs(int argc, char** argv) : _desc("Allowed options"), _vm(), kmlOutput(false), graphOutput(false), jsonOutput(false), seed(), simNodesJSONPath(), jsonOutFile() {

    _desc.add_options()("help", "produce help message")("kml", po::value<bool>(&kmlOutput)->zero_tokens())(

        "json", po::value<bool>(&jsonOutput)->zero_tokens())("graph", po::value<bool>(&graphOutput)->zero_tokens())(

        "seed", po::value<std::string>(&seed)->default_value("run1"))(

src/config/Config.cpp

+2 −2
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ 
#include <string>

#include <utility>



Config::Config() {

Config::Config() : _config() {

    std::ifstream configFile(PredefinedValues::configfile());

    configFile >> _config;

}



Config::Config(std::string fileName) {

Config::Config(std::string fileName) : _config() {

    std::ifstream configFile(fileName);

    configFile >> _config;

}

src/db/PopulationDensityReader.cpp

+3 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ 
#include <sys/types.h>

#include <unistd.h>



PopulationDensityReader::PopulationDensityReader(void) : _data(nullptr) {

    _file = open(PredefinedValues::popDensityFilePath().c_str(), O_RDONLY);

PopulationDensityReader::PopulationDensityReader(void) : _file(open(PredefinedValues::popDensityFilePath().c_str(), O_RDONLY)), _header(), _data(nullptr) {

    assert(_file != -1);

    parseHeader();

    readData();
@@ -88,6 +87,8 @@ double PopulationDensityReader::valueAt(int row, int col) { 


PopulationDensityReader::~PopulationDensityReader(void) {

    munmap(_data, getDataSize());

    _data = nullptr;

    close(_file);

}



void PopulationDensityReader::parseHeader(void) {

src/db/PopulationDensityReader.hpp

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ class PopulationDensityReader { 
    FileHeader _header;



    double* _data;



    PopulationDensityReader(const PopulationDensityReader&) = delete;

    PopulationDensityReader& operator=(const PopulationDensityReader&) = delete;

};



#endif  // POPULATIONDENSITYREADER_HPP