From b1e82b93cfc2fb265d21348fcc5c2fff3c353dd2 Mon Sep 17 00:00:00 2001 From: Mario Arias Date: Mon, 29 Sep 2014 00:51:27 +0100 Subject: [PATCH] Rename USE_ for HAVE_ in symbol definitions. --- hdt-lib/Makefile | 4 ++-- hdt-lib/qmake/hdt-lib.pro | 2 +- hdt-lib/src/dictionary/KyotoDictionary.cpp | 2 +- hdt-lib/src/dictionary/KyotoDictionary.hpp | 4 ++-- hdt-lib/src/hdt/BasicHDT.cpp | 2 +- hdt-lib/src/rdf/RDFParser.cpp | 8 ++++---- hdt-lib/src/rdf/RDFParserRaptorCallback.cpp | 2 +- hdt-lib/src/rdf/RDFParserRaptorCallback.hpp | 2 +- hdt-lib/src/rdf/RDFParserSerd.cpp | 4 ++-- hdt-lib/src/rdf/RDFParserSerd.hpp | 4 ++-- hdt-lib/src/rdf/RDFSerializer.cpp | 6 +++--- hdt-lib/src/rdf/RDFSerializerRaptor.cpp | 2 +- hdt-lib/src/rdf/RDFSerializerRaptor.hpp | 2 +- hdt-lib/src/triples/TriplesKyoto.cpp | 4 ++-- hdt-lib/src/triples/TriplesKyoto.hpp | 4 ++-- hdt-lib/src/util/fileUtil.cpp | 10 +++++----- hdt-lib/third/gzstream.cpp | 2 +- hdt-lib/tools/hdtInfo.cpp | 6 +++--- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/hdt-lib/Makefile b/hdt-lib/Makefile index 35d8c138..1319f360 100644 --- a/hdt-lib/Makefile +++ b/hdt-lib/Makefile @@ -3,10 +3,10 @@ OS := $(shell uname) LIBCDSPATH = ../libcds-v1.0.12 # Uncomment here to enable optional dependencies -#RAPTOR_SUPPORT=true +RAPTOR_SUPPORT=true #KYOTO_SUPPORT=true LIBZ_SUPPORT=true -#SERD_SUPPORT=true +SERD_SUPPORT=true CPP=g++ FLAGS=-O3 -Wno-deprecated diff --git a/hdt-lib/qmake/hdt-lib.pro b/hdt-lib/qmake/hdt-lib.pro index 3defe35a..c348c78f 100644 --- a/hdt-lib/qmake/hdt-lib.pro +++ b/hdt-lib/qmake/hdt-lib.pro @@ -25,7 +25,7 @@ CONFIG += staticlib DEFINES += HAVE_CDS DEFINES += HAVE_LIBZ HAVE_LIBRAPTOR2 RAPTOR_STATIC -#HAVE_LIBSERD_0 +#HAVE_SERD win32:OutputDir = 'win32' unix:OutputDir = 'unix' diff --git a/hdt-lib/src/dictionary/KyotoDictionary.cpp b/hdt-lib/src/dictionary/KyotoDictionary.cpp index ff50ef31..88cff890 100644 --- a/hdt-lib/src/dictionary/KyotoDictionary.cpp +++ b/hdt-lib/src/dictionary/KyotoDictionary.cpp @@ -37,7 +37,7 @@ #include #include -#ifdef USE_KYOTO +#ifdef HAVE_KYOTO namespace hdt { diff --git a/hdt-lib/src/dictionary/KyotoDictionary.hpp b/hdt-lib/src/dictionary/KyotoDictionary.hpp index a365e2c3..de551d84 100644 --- a/hdt-lib/src/dictionary/KyotoDictionary.hpp +++ b/hdt-lib/src/dictionary/KyotoDictionary.hpp @@ -42,7 +42,7 @@ #include #include -#ifdef HAVE_LIBKYOTOCABINET +#ifdef HAVE_KYOTO #include @@ -156,6 +156,6 @@ class KyotoDictIterator : public IteratorUCharString { } -#endif /* USE_KYOTO */ +#endif /* HAVE_KYOTO */ #endif /* KYOTODICTIONARY_H_ */ diff --git a/hdt-lib/src/hdt/BasicHDT.cpp b/hdt-lib/src/hdt/BasicHDT.cpp index a4af1edf..c69b4bd4 100644 --- a/hdt-lib/src/hdt/BasicHDT.cpp +++ b/hdt-lib/src/hdt/BasicHDT.cpp @@ -714,7 +714,7 @@ void BasicHDT::mapHDT(const char *fileNameChar, ProgressListener *listener) { std::string suffix = fileStr.substr(pos + 1); if( suffix == "gz") { - #ifdef USE_LIBZ + #ifdef HAVE_LIBZ this->fileName.assign(fileStr.substr(0, pos)); ifstream test(fileName.c_str()); if(test.good()) { diff --git a/hdt-lib/src/rdf/RDFParser.cpp b/hdt-lib/src/rdf/RDFParser.cpp index fa0c66ac..2486a274 100644 --- a/hdt-lib/src/rdf/RDFParser.cpp +++ b/hdt-lib/src/rdf/RDFParser.cpp @@ -6,12 +6,12 @@ */ #include "RDFParser.hpp" -#ifdef USE_RAPTOR +#ifdef HAVE_RAPTOR #include "RDFParserRaptorCallback.hpp" #endif #include "RDFParserNtriples.hpp" #include "RDFParserNtriplesCallback.hpp" -#ifdef HAVE_LIBSERD_0 +#ifdef HAVE_SERD #include "RDFParserSerd.hpp" #endif @@ -35,7 +35,7 @@ RDFParserPull *RDFParserPull::getParserPull(const char *fileName, RDFNotation no RDFParserCallback *RDFParserCallback::getParserCallback(RDFNotation notation) { -#ifdef USE_SERD +#ifdef HAVE_SERD if(notation==TURTLE) { return new RDFParserSerd(); } @@ -43,7 +43,7 @@ RDFParserCallback *RDFParserCallback::getParserCallback(RDFNotation notation) { if(notation==NTRIPLES) { return new RDFParserNtriplesCallback(); } else { -#ifdef USE_RAPTOR +#ifdef HAVE_RAPTOR return new RDFParserRaptorCallback(); #else throw "No Parser available for input RDF Format"; diff --git a/hdt-lib/src/rdf/RDFParserRaptorCallback.cpp b/hdt-lib/src/rdf/RDFParserRaptorCallback.cpp index 41325141..52aaf452 100644 --- a/hdt-lib/src/rdf/RDFParserRaptorCallback.cpp +++ b/hdt-lib/src/rdf/RDFParserRaptorCallback.cpp @@ -5,7 +5,7 @@ * Author: mck */ -#ifdef USE_RAPTOR +#ifdef HAVE_RAPTOR #include "RDFParserRaptorCallback.hpp" #include "../util/fileUtil.hpp" diff --git a/hdt-lib/src/rdf/RDFParserRaptorCallback.hpp b/hdt-lib/src/rdf/RDFParserRaptorCallback.hpp index 14a8f687..9ae90c17 100644 --- a/hdt-lib/src/rdf/RDFParserRaptorCallback.hpp +++ b/hdt-lib/src/rdf/RDFParserRaptorCallback.hpp @@ -8,7 +8,7 @@ #ifndef RDFPARSERRAPTORCALLBACK_H_ #define RDFPARSERRAPTORCALLBACK_H_ -#ifdef HAVE_LIBRAPTOR2 +#ifdef HAVE_RAPTOR #include diff --git a/hdt-lib/src/rdf/RDFParserSerd.cpp b/hdt-lib/src/rdf/RDFParserSerd.cpp index 7856fdfa..5e767f72 100644 --- a/hdt-lib/src/rdf/RDFParserSerd.cpp +++ b/hdt-lib/src/rdf/RDFParserSerd.cpp @@ -1,5 +1,5 @@ -#ifdef USE_SERD +#ifdef HAVE_SERD #include "../util/fileUtil.hpp" @@ -117,7 +117,7 @@ SerdStatus hdtserd_end(void* handle, const SerdNode* node) { -RDFParserSerd::RDFParserSerd() +RDFParserSerd::RDFParserSerd() : numByte(0) { } diff --git a/hdt-lib/src/rdf/RDFParserSerd.hpp b/hdt-lib/src/rdf/RDFParserSerd.hpp index 309e5aaf..6aa10684 100644 --- a/hdt-lib/src/rdf/RDFParserSerd.hpp +++ b/hdt-lib/src/rdf/RDFParserSerd.hpp @@ -1,7 +1,7 @@ #ifndef RDFPARSERSERD_HPP #define RDFPARSERSERD_HPP -#ifdef HAVE_LIBSERD_0 +#ifdef HAVE_SERD #include @@ -19,7 +19,7 @@ class RDFParserSerd : public RDFParserCallback { SerdEnv *env; RDFCallback *callback; string error; - uint64_t numByte=0; + uint64_t numByte; string getString(const SerdNode *term); string getStringObject(const SerdNode *term, const SerdNode *dataType, const SerdNode *lang); diff --git a/hdt-lib/src/rdf/RDFSerializer.cpp b/hdt-lib/src/rdf/RDFSerializer.cpp index 5a02ac17..0b1b98d4 100644 --- a/hdt-lib/src/rdf/RDFSerializer.cpp +++ b/hdt-lib/src/rdf/RDFSerializer.cpp @@ -6,7 +6,7 @@ */ #include "RDFSerializer.hpp" -#ifdef USE_RAPTOR +#ifdef HAVE_RAPTOR #include "RDFSerializerRaptor.hpp" #endif #include "RDFSerializerNTriples.hpp" @@ -15,7 +15,7 @@ namespace hdt { RDFSerializer *RDFSerializer::getSerializer(std::ostream &out, RDFNotation notation) { -#ifdef USE_RAPTOR +#ifdef HAVE_RAPTOR return new RDFSerializerRaptor(out, notation); #else if(notation==NTRIPLES) { @@ -28,7 +28,7 @@ RDFSerializer *RDFSerializer::getSerializer(std::ostream &out, RDFNotation notat RDFSerializer *RDFSerializer::getSerializer(const char *fileName, RDFNotation notation) { -#ifdef USE_RAPTOR +#ifdef HAVE_RAPTOR return new RDFSerializerRaptor(fileName, notation); #else if(notation==NTRIPLES) { diff --git a/hdt-lib/src/rdf/RDFSerializerRaptor.cpp b/hdt-lib/src/rdf/RDFSerializerRaptor.cpp index 615cc479..103c67a9 100644 --- a/hdt-lib/src/rdf/RDFSerializerRaptor.cpp +++ b/hdt-lib/src/rdf/RDFSerializerRaptor.cpp @@ -5,7 +5,7 @@ * Author: mck */ -#ifdef USE_RAPTOR +#ifdef HAVE_RAPTOR #include "RDFSerializerRaptor.hpp" using namespace std; diff --git a/hdt-lib/src/rdf/RDFSerializerRaptor.hpp b/hdt-lib/src/rdf/RDFSerializerRaptor.hpp index 28c72e4b..459fe555 100644 --- a/hdt-lib/src/rdf/RDFSerializerRaptor.hpp +++ b/hdt-lib/src/rdf/RDFSerializerRaptor.hpp @@ -8,7 +8,7 @@ #ifndef RDFSERIALIZERRAPTOR_H_ #define RDFSERIALIZERRAPTOR_H_ -#ifdef HAVE_LIBRAPTOR2 +#ifdef HAVE_RAPTOR #include #include "RDFSerializer.hpp" diff --git a/hdt-lib/src/triples/TriplesKyoto.cpp b/hdt-lib/src/triples/TriplesKyoto.cpp index 49eaa44e..ef57036c 100644 --- a/hdt-lib/src/triples/TriplesKyoto.cpp +++ b/hdt-lib/src/triples/TriplesKyoto.cpp @@ -40,7 +40,7 @@ #include "../util/Histogram.h" -#ifdef USE_KYOTO +#ifdef HAVE_KYOTO namespace hdt { @@ -295,4 +295,4 @@ TripleID *TriplesKyotoIterator::next() { } -#endif /* USE_KYOTO */ +#endif /* HAVE_KYOTO */ diff --git a/hdt-lib/src/triples/TriplesKyoto.hpp b/hdt-lib/src/triples/TriplesKyoto.hpp index 2dde2208..0baa5d64 100644 --- a/hdt-lib/src/triples/TriplesKyoto.hpp +++ b/hdt-lib/src/triples/TriplesKyoto.hpp @@ -39,7 +39,7 @@ #include "TriplesComparator.hpp" #include "../libdcs/CSD.h" -#ifdef HAVE_LIBKYOTOCABINET +#ifdef HAVE_KYOTO #include @@ -204,7 +204,7 @@ class TriplesKyotoIterator : public IteratorTripleID { } -#endif /* USE_KYOTO */ +#endif /* HAVE_KYOTO */ #endif /* TRIPLESKYOTO_H_ */ diff --git a/hdt-lib/src/util/fileUtil.cpp b/hdt-lib/src/util/fileUtil.cpp index c7a7e1ea..c4e101de 100644 --- a/hdt-lib/src/util/fileUtil.cpp +++ b/hdt-lib/src/util/fileUtil.cpp @@ -31,7 +31,7 @@ #include #include "fileUtil.hpp" -#ifdef USE_LIBZ +#ifdef HAVE_LIBZ #include #endif @@ -64,7 +64,7 @@ uint64_t fileUtil::getSize(const char *file) { void fileUtil::decompress(const char *input, const char * output, hdt::ProgressListener *listener) { -#ifdef USE_LIBZ +#ifdef HAVE_LIBZ #ifdef WIN32 const size_t CHUNK=64*1024; #else @@ -159,7 +159,7 @@ void fileUtil::decompress(const char *input, const char * output, hdt::ProgressL DecompressStream::DecompressStream(const char *fileName) : filePipe(NULL), fileStream(NULL), in(NULL) { -#ifdef USE_LIBZ +#ifdef HAVE_LIBZ gzStream = NULL; #endif string fn = fileName; @@ -168,7 +168,7 @@ DecompressStream::DecompressStream(const char *fileName) : filePipe(NULL), fileS #ifdef WIN32 if( suffix == "gz") { - #ifdef USE_LIBZ + #ifdef HAVE_LIBZ in = gzStream = new igzstream(fileName); #else throw "Support for GZIP was not compiled in this version. Please Decompress the file before importing it."; @@ -208,7 +208,7 @@ DecompressStream::DecompressStream(const char *fileName) : filePipe(NULL), fileS void DecompressStream::close() { if(fileStream) fileStream->close(); if(filePipe) pclose(filePipe); -#ifdef USE_LIBZ +#ifdef HAVE_LIBZ if(gzStream) gzStream->close(); #endif delete in; diff --git a/hdt-lib/third/gzstream.cpp b/hdt-lib/third/gzstream.cpp index af4c7d7a..c0ed2853 100644 --- a/hdt-lib/third/gzstream.cpp +++ b/hdt-lib/third/gzstream.cpp @@ -34,7 +34,7 @@ namespace GZSTREAM_NAMESPACE { #endif -#ifdef USE_LIBZ +#ifdef HAVE_LIBZ // ---------------------------------------------------------------------------- // Internal classes to implement gzstream. See header file for user classes. // ---------------------------------------------------------------------------- diff --git a/hdt-lib/tools/hdtInfo.cpp b/hdt-lib/tools/hdtInfo.cpp index cde68763..d5a9c723 100644 --- a/hdt-lib/tools/hdtInfo.cpp +++ b/hdt-lib/tools/hdtInfo.cpp @@ -81,7 +81,7 @@ int main(int argc, char **argv) { try { -#ifdef USE_LIBZ +#ifdef HAVE_LIBZ igzstream *inGz; #endif ifstream *inF; @@ -92,7 +92,7 @@ int main(int argc, char **argv) { std::string pipeCommand; if( suffix == "gz"){ - #ifdef USE_LIBZ + #ifdef HAVE_LIBZ in = inGz = new igzstream(inputFile.c_str()); #else throw "Support for GZIP was not compiled in this version. Please Decompress the file before importing it."; @@ -118,7 +118,7 @@ int main(int argc, char **argv) { header->load(*in, controlInformation); if( suffix == "gz") { -#ifdef USE_LIBZ +#ifdef HAVE_LIBZ inGz->close(); #endif } else {