Compile fixes

This commit is contained in:
Dennis Luxen 2011-11-26 13:16:36 +00:00
parent aac6f45f54
commit e3ad54996f

View File

@ -28,9 +28,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <limits> #include <limits>
#include <vector> #include <vector>
#include <stxxl.h> #include <stxxl.h>
#ifdef _OPENMP
#include <omp.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
#include <math.h> #include <math.h>
@ -152,14 +149,14 @@ static boost::thread_specific_ptr<std::ifstream> localStream;
template<bool WriteAccess = false> template<bool WriteAccess = false>
class NNGrid { class NNGrid {
public: public:
NNGrid() /*: cellCache(500), fileCache(500)*/ { NNGrid() {
ramIndexTable.resize((1024*1024), UINT_MAX); ramIndexTable.resize((1024*1024), UINT_MAX);
if( WriteAccess) { if( WriteAccess) {
entries = new stxxl::vector<GridEntry>(); entries = new stxxl::vector<GridEntry>();
} }
} }
NNGrid(const char* rif, const char* _i, unsigned numberOfThreads = omp_get_num_procs()) /*: cellCache(500), fileCache(500) */{ NNGrid(const char* rif, const char* _i) {
if(WriteAccess) { if(WriteAccess) {
ERR("Not available in Write mode"); ERR("Not available in Write mode");
} }