Commit 6456c13f authored by thillux's avatar thillux
Browse files

further cleanups

parent 35ecd41d

src/db/InternetUsageStatistics.cpp

+3 −2
Original line number Diff line number Diff line
@@ -28,10 +28,11 @@ 
 */



#include "InternetUsageStatistics.hpp"

#include <sstream>



#include <boost/log/trivial.hpp>

#include <cassert>

#include <iostream>

#include <boost/log/trivial.hpp>

#include <sstream>



InternetUsageStatistics::InternetUsageStatistics(std::string dbPath) {

    int retval = sqlite3_open(dbPath.c_str(), &_sqliteDB);

src/db/LandingPointReader.cpp

+2 −1
Original line number Diff line number Diff line
@@ -28,9 +28,10 @@ 
 */



#include "LandingPointReader.hpp"



#include <boost/log/trivial.hpp>

#include <cassert>

#include <iostream>

#include <boost/log/trivial.hpp>



LandingPointReader::LandingPointReader(std::string dbName) {

    int retval = sqlite3_open(dbName.c_str(), &_sqliteDB);

src/db/LandingPointReader.hpp

+2 −3
Original line number Diff line number Diff line
@@ -30,11 +30,10 @@ 
#ifndef LANDINGPOINTREADER_HPP

#define LANDINGPOINTREADER_HPP



#include "SQLiteReader.hpp"

#include "geo/SeaCableLandingPoint.hpp"

#include "ResultIterator.hpp"

#include <sqlite3.h>

#include "SQLiteReader.hpp"

#include <string>

#include "geo/SeaCableLandingPoint.hpp"



class LandingPointReader : public SQLiteReader, public ResultIterator<SeaCableLandingPoint> {

   public:

src/db/PopulationDensityReader.cpp

+8 −7
Original line number Diff line number Diff line
@@ -28,20 +28,21 @@ 
 */



#include "PopulationDensityReader.hpp"



#include "config/PredefinedValues.hpp"

#include "util/Util.hpp"

#include <cassert>

#include <string>

#include <cmath>

#include <cstdint>

#include <cstring>

#include <fcntl.h>

#include <fstream>

#include <iostream>

#include <string>

#include <sys/mman.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>

#include <sys/types.h>

#include <unistd.h>

#include <iostream>

#include <cstdint>

#include <cstring>

#include <cmath>



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

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

src/db/PopulationDensityReader.hpp

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#ifndef POPULATIONDENSITYREADER_HPP

#define POPULATIONDENSITYREADER_HPP



#include <vector>

#include <memory>

#include <vector>



class PopulationDensityReader;

typedef std::shared_ptr<PopulationDensityReader> PopulationDensityReader_Ptr;