diff options
Diffstat (limited to 'fastlib/src')
18 files changed, 19 insertions, 53 deletions
diff --git a/fastlib/src/vespa/fastlib/io/bufferedfile.h b/fastlib/src/vespa/fastlib/io/bufferedfile.h index 7443b325dd4..d0fb0fbf1f6 100644 --- a/fastlib/src/vespa/fastlib/io/bufferedfile.h +++ b/fastlib/src/vespa/fastlib/io/bufferedfile.h @@ -13,14 +13,13 @@ #pragma once -#include <vespa/fastos/fastos.h> -#include <vespa/vespalib/util/noncopyable.hpp> #include <vespa/vespalib/util/alloc.h> +#include <vespa/fastos/file.h> /** * Provides buffered file access. */ -class Fast_BufferedFile : public FastOS_FileInterface, public vespalib::noncopyable +class Fast_BufferedFile : public FastOS_FileInterface { private: using Alloc = vespalib::alloc::Alloc; @@ -56,6 +55,8 @@ public: Fast_BufferedFile(FastOS_FileInterface *file); Fast_BufferedFile(); Fast_BufferedFile(size_t bufferSize); + Fast_BufferedFile(const Fast_BufferedFile &) = delete; + Fast_BufferedFile & operator = (const Fast_BufferedFile &) = delete; /** * Delete the file instance used for low-level file access. diff --git a/fastlib/src/vespa/fastlib/io/fileinputstream.h b/fastlib/src/vespa/fastlib/io/fileinputstream.h index 16920632396..08806f1d19d 100644 --- a/fastlib/src/vespa/fastlib/io/fileinputstream.h +++ b/fastlib/src/vespa/fastlib/io/fileinputstream.h @@ -16,7 +16,6 @@ ******************************************************************************/ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/io/inputstream.h> diff --git a/fastlib/src/vespa/fastlib/io/fileoutputstream.h b/fastlib/src/vespa/fastlib/io/fileoutputstream.h index 3b4ce2bcba3..1c198c8dd8d 100644 --- a/fastlib/src/vespa/fastlib/io/fileoutputstream.h +++ b/fastlib/src/vespa/fastlib/io/fileoutputstream.h @@ -16,7 +16,6 @@ ******************************************************************************/ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/io/outputstream.h> diff --git a/fastlib/src/vespa/fastlib/io/inputstream.h b/fastlib/src/vespa/fastlib/io/inputstream.h index dcc031ef675..56f4d666dc3 100644 --- a/fastlib/src/vespa/fastlib/io/inputstream.h +++ b/fastlib/src/vespa/fastlib/io/inputstream.h @@ -16,7 +16,6 @@ ******************************************************************************/ #pragma once -#include <vespa/fastos/fastos.h> diff --git a/fastlib/src/vespa/fastlib/io/outputstream.h b/fastlib/src/vespa/fastlib/io/outputstream.h index 2fb4c364e38..9e6f42fd4c5 100644 --- a/fastlib/src/vespa/fastlib/io/outputstream.h +++ b/fastlib/src/vespa/fastlib/io/outputstream.h @@ -16,7 +16,6 @@ ******************************************************************************/ #pragma once -#include <vespa/fastos/fastos.h> diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h index 4381e0f5741..2505ae42d4e 100644 --- a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h +++ b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h @@ -18,7 +18,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/io/filterinputstream.h> diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h index 97c6e926323..b845f3402a7 100644 --- a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h +++ b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h @@ -18,7 +18,6 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/io/filteroutputstream.h> diff --git a/fastlib/src/vespa/fastlib/net/httpserver.cpp b/fastlib/src/vespa/fastlib/net/httpserver.cpp index e12477bd030..44e4dc6a8bc 100644 --- a/fastlib/src/vespa/fastlib/net/httpserver.cpp +++ b/fastlib/src/vespa/fastlib/net/httpserver.cpp @@ -1121,7 +1121,7 @@ Fast_HTTPConnection::~Fast_HTTPConnection(void) -void Fast_HTTPConnection::OutputFile(FastOS_File *file) +void Fast_HTTPConnection::OutputFile(FastOS_FileInterface *file) { const int bufferSize = 2048; char buffer[bufferSize]; diff --git a/fastlib/src/vespa/fastlib/net/httpserver.h b/fastlib/src/vespa/fastlib/net/httpserver.h index bbe8235cf8b..c644f5ef57c 100644 --- a/fastlib/src/vespa/fastlib/net/httpserver.h +++ b/fastlib/src/vespa/fastlib/net/httpserver.h @@ -18,13 +18,16 @@ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/io/inputstream.h> #include <vespa/fastlib/io/outputstream.h> #include <vespa/fastlib/net/socket.h> #include <vespa/fastlib/util/bag.h> #include <vespa/vespalib/stllike/string.h> +#include <vespa/fastos/thread.h> +#include <vespa/fastos/cond.h> +#include <vespa/fastos/serversocket.h> +class FastOS_FileInterface; class Fast_HTTPServer; #define FASTLIB_SUCCESS (0) @@ -92,7 +95,7 @@ private: void Run (FastOS_ThreadInterface *thisThread, void *params); void Output(const char *outputString); void OutputData(const void *data, size_t len); - void OutputFile(FastOS_File *file); + void OutputFile(FastOS_FileInterface *file); const Fast_InputStream *GetInputStream() const {return _input;} Fast_InputStream *GetInputStream() {return _input;} diff --git a/fastlib/src/vespa/fastlib/net/socket.h b/fastlib/src/vespa/fastlib/net/socket.h index c2e933ab29d..ccd3a0dff23 100644 --- a/fastlib/src/vespa/fastlib/net/socket.h +++ b/fastlib/src/vespa/fastlib/net/socket.h @@ -1,38 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** -******************************************************************************* -* -* @author Stein Hardy Danielsen -* @date Creation date: 2000-9-28 -* @version $Id$ -* -* @file -* -* Socket class with input and output stream interfaces -* -* Copyright (c) : 1997-2000 Fast Search & Transfer ASA -* ALL RIGHTS RESERVED -* -******************************************************************************/ #pragma once -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/io/inputstream.h> #include <vespa/fastlib/io/outputstream.h> +#include <vespa/fastos/socket.h> -/** -******************************************************************************** -* -* Socket class with input and output stream interfaces -* @author Stein Hardy Danielsen -* @date Creation date: 2000-9-28 -* @version $Id$ -* -* -* Copyright (c) : 1997-1999 Fast Search & Transfer ASA -* ALL RIGHTS RESERVED -* -******************************************************************************/ class Fast_Socket : public FastOS_Socket, public Fast_InputStream, public Fast_OutputStream diff --git a/fastlib/src/vespa/fastlib/testsuite/suite.h b/fastlib/src/vespa/fastlib/testsuite/suite.h index ef844a7f85f..9ea242bb84d 100644 --- a/fastlib/src/vespa/fastlib/testsuite/suite.h +++ b/fastlib/src/vespa/fastlib/testsuite/suite.h @@ -18,7 +18,6 @@ * ----- * * #include <iosfwd> - * #include <vespa/fastos/fastos.h> * #include <vespa/fastlib/testsuite/suite.h> * * class MySuite : public Suite diff --git a/fastlib/src/vespa/fastlib/testsuite/test.h b/fastlib/src/vespa/fastlib/testsuite/test.h index 40b99c6ed66..09a2c31f795 100644 --- a/fastlib/src/vespa/fastlib/testsuite/test.h +++ b/fastlib/src/vespa/fastlib/testsuite/test.h @@ -16,7 +16,6 @@ * mytest.h: * ---- * #include <iosfwd> - * #include <vespa/fastos/fastos.h> * #include <vespa/fastlib/testsuite/test.h> * * class MyTest : public Test diff --git a/fastlib/src/vespa/fastlib/text/normwordfolder.cpp b/fastlib/src/vespa/fastlib/text/normwordfolder.cpp index f05377dae9b..94a2f8f2f28 100644 --- a/fastlib/src/vespa/fastlib/text/normwordfolder.cpp +++ b/fastlib/src/vespa/fastlib/text/normwordfolder.cpp @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/text/unicodeutil.h> #include <vespa/fastlib/text/normwordfolder.h> +#include <vespa/fastos/mutex.h> bool Fast_NormalizeWordFolder::_isInitialized = false; -FastOS_Mutex Fast_NormalizeWordFolder::_initMutex; +FastOS_Mutex _initMutex; bool Fast_NormalizeWordFolder::_doAccentRemoval = false; bool Fast_NormalizeWordFolder::_doSmallToNormalKana = false; bool Fast_NormalizeWordFolder::_doKatakanaToHiragana = false; diff --git a/fastlib/src/vespa/fastlib/text/normwordfolder.h b/fastlib/src/vespa/fastlib/text/normwordfolder.h index e5908c08ae9..c1240dc40bd 100644 --- a/fastlib/src/vespa/fastlib/text/normwordfolder.h +++ b/fastlib/src/vespa/fastlib/text/normwordfolder.h @@ -3,6 +3,7 @@ #pragma once #include <vespa/fastlib/text/wordfolder.h> +#include <cstdint> /** * WordFolder that both lowercases, removes accents, and converts @@ -12,7 +13,6 @@ class Fast_NormalizeWordFolder : public Fast_WordFolder { private: static bool _isInitialized; - static FastOS_Mutex _initMutex; /** Features */ static bool _doAccentRemoval; @@ -81,7 +81,7 @@ public: public: static const char *ReplacementString(ucs4_t testchar) { if (testchar < 0xc4 || testchar > 0x1f3) { - return NULL; + return nullptr; } if (testchar == 0xdf && _doSharpSSubstitution) { return "ss"; @@ -147,12 +147,12 @@ public: return "th"; default: - return NULL; + return nullptr; } } - return NULL; + return nullptr; } private: /** diff --git a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h index d6a4ff44678..2300b83d6db 100644 --- a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h +++ b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h @@ -1,5 +1,4 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/testsuite/test.h> #include "../unicodeutil.h" diff --git a/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h b/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h index d16ec40149f..28c7e8f06f2 100644 --- a/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h +++ b/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <memory> -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/testsuite/test.h> #include "../wordfolder.h" diff --git a/fastlib/src/vespa/fastlib/text/unicodeutil.h b/fastlib/src/vespa/fastlib/text/unicodeutil.h index 06916616062..f314f9b1c68 100644 --- a/fastlib/src/vespa/fastlib/text/unicodeutil.h +++ b/fastlib/src/vespa/fastlib/text/unicodeutil.h @@ -4,9 +4,10 @@ */ #pragma once +#include <sys/types.h> + #define FASTLIB_UNICODEUTIL_USES_WORDCHARPROP -#include <vespa/fastos/fastos.h> /** utf8_t is the type of the multi-byte UTF-8 character components */ typedef unsigned char utf8_t; diff --git a/fastlib/src/vespa/fastlib/util/tests/bagtest.h b/fastlib/src/vespa/fastlib/util/tests/bagtest.h index 92e5eb3e9b1..3bfff40a50f 100644 --- a/fastlib/src/vespa/fastlib/util/tests/bagtest.h +++ b/fastlib/src/vespa/fastlib/util/tests/bagtest.h @@ -2,7 +2,6 @@ #include <iostream> -#include <vespa/fastos/fastos.h> #include <vespa/fastlib/util/bag.h> #include <vespa/fastlib/testsuite/test.h> |