Merge pull request #2349 from yahoo/balder/normal-include-fastlib

Fix warnings hidden earlier due to including application headers as s…

8 files changed, 28 insertions, 265 deletions

diff --git a/fastlib/src/vespa/fastlib/io/fileoutputstream.h b/fastlib/src/vespa/fastlib/io/fileoutputstream.h
index 1c198c8dd8d..8f9b2ebfb2b 100644
--- a/fastlib/src/vespa/fastlib/io/fileoutputstream.h
+++ b/fastlib/src/vespa/fastlib/io/fileoutputstream.h
@@ -1,39 +1,9 @@
 // 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-10-07
-* @version         $Id$
-*
-* @file
-*
-* FileOutputStream class
-*
-* Copyright (c)  : 1997-2000 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
-#pragma once
-
-#include <vespa/fastlib/io/outputstream.h>
-
 
+#pragma once
 
+#include "outputstream.h"
 
-/**
-********************************************************************************
-*
-* FileOutputStream class
-* @author          Stein Hardy Danielsen
-* @date            Creation date: 2000-10-07
-* @version         $Id$
-*
-*
-* Copyright (c)  : 1997-2000 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
 class Fast_FileOutputStream  : public Fast_OutputStream
 {
 private:
@@ -46,36 +16,15 @@ private:
     FastOS_FileInterface  *_theFile;
 
   public:
-
-    /** Constructor */
     Fast_FileOutputStream(const char *fileName);
+    ~Fast_FileOutputStream();
 
-    /** Destructor */
-    virtual ~Fast_FileOutputStream(void);
-
-
-    // Implementation of Fast_OutputStream interface
-
-    inline ssize_t Write(const void *sourceBuffer, size_t bufferSize)
-    {
+    ssize_t Write(const void *sourceBuffer, size_t bufferSize) override {
       return _theFile->CheckedWrite(sourceBuffer, bufferSize) ?
           static_cast<ssize_t>(bufferSize) :
           static_cast<ssize_t>(-1);
     };
 
-    inline bool Close(void)
-    {
-      return _theFile->Close();
-    };
-
-    inline void Flush(void)
-    {
-    };
-
+    bool Close() override { return _theFile->Close(); }
+    void Flush() override {}
 };
-
-
-
-
-
-
diff --git a/fastlib/src/vespa/fastlib/io/filterinputstream.h b/fastlib/src/vespa/fastlib/io/filterinputstream.h
index feafe6ba2cf..116a16ff89d 100644
--- a/fastlib/src/vespa/fastlib/io/filterinputstream.h
+++ b/fastlib/src/vespa/fastlib/io/filterinputstream.h
@@ -16,11 +16,7 @@
 ******************************************************************************/
 #pragma once
 
-#include <vespa/fastlib/io/inputstream.h>
-
-
-
-
+#include "inputstream.h"
 
 class Fast_FilterInputStream : public Fast_InputStream
 {
@@ -43,18 +39,13 @@ class Fast_FilterInputStream : public Fast_InputStream
     // Constructors
     Fast_FilterInputStream(Fast_InputStream &in) : _in(&in) {}
 
-    virtual ~Fast_FilterInputStream(void) {};
+    ~Fast_FilterInputStream() {};
 
+    ssize_t Available()              override  { return _in->Available();      }
+    bool    Close()                  override  { return _in->Close();          }
+    ssize_t Skip(size_t skipNBytes)  override { return _in->Skip(skipNBytes); }
 
-    virtual ssize_t Available(void)          { return _in->Available();      }
-    virtual bool    Close(void)              { return _in->Close();          }
-    virtual ssize_t Skip(size_t skipNBytes)  { return _in->Skip(skipNBytes); }
-
-    virtual inline ssize_t Read(void *targetBuffer, size_t length)
-    {
+    ssize_t Read(void *targetBuffer, size_t length) override {
       return _in->Read(targetBuffer, length);
     }
-
 };
-
-
diff --git a/fastlib/src/vespa/fastlib/io/filteroutputstream.h b/fastlib/src/vespa/fastlib/io/filteroutputstream.h
index 5dc58d1320e..c3ec9d28399 100644
--- a/fastlib/src/vespa/fastlib/io/filteroutputstream.h
+++ b/fastlib/src/vespa/fastlib/io/filteroutputstream.h
@@ -1,60 +1,29 @@
 // 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-1-14
-* @version         $Id$
-*
-* @file
-*
-* Generic filter output stream interfaces
-*
-* Copyright (c)  : 1997-1999 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
-#pragma once
-
-#include <vespa/fastlib/io/outputstream.h>
-
-
 
+#pragma once
 
+#include "outputstream.h"
 
 class Fast_FilterOutputStream : public Fast_OutputStream
 {
   private:
 
     // Prevent use of:
-    Fast_FilterOutputStream(void);
+    Fast_FilterOutputStream();
     Fast_FilterOutputStream(Fast_FilterOutputStream &);
     Fast_FilterOutputStream &operator=(const Fast_FilterOutputStream &);
 
-
   protected:
-
     /** The stream to forward data to */
     Fast_OutputStream *_out;
-
-
   public:
+    Fast_FilterOutputStream(Fast_OutputStream &out) : _out(&out) {}
+    ~Fast_FilterOutputStream() {}
 
-    // Constructors
-    Fast_FilterOutputStream(Fast_OutputStream &out) : _out(&out) {};
-
-    virtual ~Fast_FilterOutputStream(void) {};
-
-
-    virtual bool Close(void)    { return _out->Close(); }
-    virtual void Flush(void)    {        _out->Flush(); }
+    bool Close()   override { return _out->Close(); }
+    void Flush()   override {        _out->Flush(); }
 
-    virtual inline ssize_t Write(const void *sourceBuffer, size_t length)
-    {
+    ssize_t Write(const void *sourceBuffer, size_t length) override {
       return _out->Write(sourceBuffer, length);
     }
-
 };
-
-
-
diff --git a/fastlib/src/vespa/fastlib/testsuite/CMakeLists.txt b/fastlib/src/vespa/fastlib/testsuite/CMakeLists.txt
index 0b8fa19811a..08df1db0b78 100644
--- a/fastlib/src/vespa/fastlib/testsuite/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/testsuite/CMakeLists.txt
@@ -2,6 +2,7 @@
 vespa_add_library(fastlib_fast_testsuite
     SOURCES
     suite.cpp
+    test.cpp
     INSTALL lib64
     DEPENDS
 )
diff --git a/fastlib/src/vespa/fastlib/testsuite/test.h b/fastlib/src/vespa/fastlib/testsuite/test.h
index 09a2c31f795..02e05f48444 100644
--- a/fastlib/src/vespa/fastlib/testsuite/test.h
+++ b/fastlib/src/vespa/fastlib/testsuite/test.h
@@ -129,144 +129,7 @@ private:
   Test& operator=(const Test&);
 };
 
-inline
-Test::Test(std::ostream* osptr, const char*name) :
-  m_osptr(osptr),
-  name_(name),
-  m_nPass(0),
-  m_nFail(0),
-  m_index(0),
-  m_description()
-{
-  m_pchar[0]= '|';
-  m_pchar[1]= '-';
-}
-
-inline
-Test::Test(const char*name) :
-  Test(nullptr, name)
-{
-}
-
-inline
-const char *Test::get_name() const {
-  return (name_ == NULL) ? "Test " : name_;
-}
-
-inline
-const std::string& Test::GetSourceDirectory()
-{
-  static const std::string srcDir = [] () {
-      std::string dir(".");
-      const char* env = getenv("SOURCE_DIRECTORY");
-      if (env) {
-        dir = env;
-      }
-      if (*dir.rbegin() != '/') {
-        dir += "/";
-      }
-      return dir;
-  } ();
-  return srcDir;
-}
-
-inline
-long Test::GetNumPassed() const
-{
-  return m_nPass;
-}
-
-inline
-long Test::GetNumFailed() const
-{
-  return m_nFail;
-}
-
-inline
-const std::ostream* Test::GetStream() const
-{
-  return m_osptr;
-}
-
-inline
-void Test::SetStream(std::ostream* osptr)
-{
-  m_osptr = osptr;
-}
-
-inline
-void Test::_Succeed()
-{
-  ++m_nPass;
-}
-
-inline
-void Test::Reset()
-{
-  m_nPass = m_nFail = 0;
-}
-
-
-inline
-void Test::PushDesc(const std::string& desc)
-{
-  m_description.push_back(desc);
-}
-
-inline
-void Test::PopDesc()
-{
-  m_description.pop_back();
-}
-
-inline
-size_t Test::print_desc() const
-{
-  std::copy(m_description.begin(), m_description.end(),
-            std::ostream_iterator<std::string>(*m_osptr));
-  return m_description.size();
-}
-
-inline
-void Test::print_progress() {
-  ++m_index;
-  m_index = m_index % 2;
-  *m_osptr << '\b' <<'\b' <<'\b';
-  *m_osptr <<' ' << m_pchar[m_index] << ' ' << std::flush;
-}
-
-inline
-bool Test::do_fail(const std::string& lbl, const char* fname, long lineno,
-                   bool addEndl)
-{
-  ++m_nFail;
-  if (m_osptr) {
-    *m_osptr << std::endl
-             << fname << ':' << lineno << ": "
-             << get_name() << " failure: (" << lbl << ")"
-             << std::endl;
-    if (addEndl && print_desc() > 0)
-      *m_osptr << std::endl << std::endl;
-  }
-  return false;
-}
-
-inline
-bool Test::do_test(bool cond, const std::string& lbl,
-                   const char* fname, long lineno)
-{
-  if (!cond) {
-    return do_fail(lbl, fname, lineno);
-  }
-  else {
-    _Succeed();
-    print_progress();
-    return true;
-  }
-}
-
 template <typename t1, typename t2>
-inline
 bool Test::do_equality_test(const t1& lhs, const t2& rhs, const char* lbl,
                             const char* fname, long lineno)
 {
@@ -286,20 +149,3 @@ bool Test::do_equality_test(const t1& lhs, const t2& rhs, const char* lbl,
   }
   return false;
 }
-
-inline
-long Test::Report(int padSpaces) const
-{
-  if (m_osptr) {
-    *m_osptr << std::endl << get_name();
-
-    // Pad the name with the given number of spaces
-    for (int i= 0; i < padSpaces; ++i) *m_osptr << ' ';
-
-    *m_osptr << "\tPassed: " << m_nPass
-             << "\tFailed: " << m_nFail
-             << std::endl;
-  }
-  return m_nFail;
-}
-
diff --git a/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt
index e0c137151ca..125c6a1b036 100644
--- a/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt
@@ -4,6 +4,7 @@ vespa_add_executable(fastlib_unicodeutiltest_app TEST
     unicodeutiltest.cpp
     DEPENDS
     fastlib_text
+    fastlib_fast_testsuite
 )
 vespa_add_test(NAME fastlib_unicodeutiltest_app NO_VALGRIND COMMAND fastlib_unicodeutiltest_app)
 vespa_add_executable(fastlib_latintokenizertest_app TEST
@@ -11,6 +12,7 @@ vespa_add_executable(fastlib_latintokenizertest_app TEST
     latintokenizertest.cpp
     DEPENDS
     fastlib_text
+    fastlib_fast_testsuite
 )
 vespa_add_test(NAME fastlib_latintokenizertest_app NO_VALGRIND COMMAND fastlib_latintokenizertest_app)
 vespa_add_executable(fastlib_wordfolderstest_app TEST
@@ -18,5 +20,6 @@ vespa_add_executable(fastlib_wordfolderstest_app TEST
     wordfolderstest.cpp
     DEPENDS
     fastlib_text
+    fastlib_fast_testsuite
 )
 vespa_add_test(NAME fastlib_wordfolderstest_app NO_VALGRIND COMMAND fastlib_wordfolderstest_app)
diff --git a/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt
index 3cd980552fe..83c6a53984a 100644
--- a/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt
@@ -4,6 +4,7 @@ vespa_add_executable(fastlib_base64test_app TEST
     base64test.cpp
     DEPENDS
     fastlib_util
+    fastlib_fast_testsuite
 )
 vespa_add_test(NAME fastlib_base64test_app NO_VALGRIND COMMAND fastlib_base64test_app fastlib_base64test_app)
 vespa_add_executable(fastlib_bagtest_app TEST
@@ -11,11 +12,13 @@ vespa_add_executable(fastlib_bagtest_app TEST
     bagtest.cpp
     DEPENDS
     fastlib_util
+    fastlib_fast_testsuite
 )
 vespa_add_test(NAME fastlib_bagtest_app NO_VALGRIND COMMAND fastlib_bagtest_app)
 vespa_add_executable(fastlib_wildcard_match_test_app TEST
     SOURCES
     wildcard_match_test.cpp
     DEPENDS
+    fastlib_fast_testsuite
 )
 vespa_add_test(NAME fastlib_wildcard_match_test_app NO_VALGRIND COMMAND fastlib_wildcard_match_test_app)
diff --git a/fastlib/src/vespa/packages/CMakeLists.txt b/fastlib/src/vespa/packages/CMakeLists.txt
index 6abbd044f21..35c7b4ec191 100644
--- a/fastlib/src/vespa/packages/CMakeLists.txt
+++ b/fastlib/src/vespa/packages/CMakeLists.txt
@@ -7,4 +7,5 @@ vespa_add_library(fastlib_fast
     fastlib_text
     fastlib_io
     fastlib_util
+    fastlib_fast_testsuite
 )