updates

.cspell/words.txt

@@ -1,6 +1,9 @@
 bdiff
 cmake_current_source_dir
+dhave_unistd_h
+dhave_unistd_h
 fpatch
+have_unistd_h
 intdiff
 intdifftest
 kubo

CMakeLists.txt

@@ -6,11 +6,18 @@ project(
   VERSION 1.21
 )
 
+include(CheckIncludeFile)
+
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+check_include_file(unistd.h HAVE_UNISTD_H)
+if(HAVE_UNISTD_H)
+  add_definitions(-DHAVE_UNISTD_H)
+endif()
+
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 option(DTL_ENABLE_TESTING "Enable DTL unit tests" OFF)

examples/common.hpp

@@ -1,6 +1,19 @@
 #ifndef DTL_EXAMPLE_COMMON_H
 #define DTL_EXAMPLE_COMMON_H
 
+#include <cassert>
+#include <cstdio>
+#include <fstream>
+#include <sstream>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif // HAVE_UNISTD_H
+
 #include "dtl/dtl.hpp"
 
 bool isFileExist(std::string &fs);

include/dtl/Lcs.hpp

@@ -38,7 +38,6 @@
 #ifndef DTL_LCS_H
 #define DTL_LCS_H
 
-#include "dtl/variables.hpp"
 #include "dtl/Sequence.hpp"
 
 namespace dtl {

include/dtl/Sequence.hpp

@@ -38,8 +38,9 @@
 #ifndef DTL_SEQUENCE_H
 #define DTL_SEQUENCE_H
 
-namespace dtl {
+#include <vector>
 
+namespace dtl {
 /**
  * sequence class template
  */

include/dtl/Ses.hpp

@@ -38,6 +38,9 @@
 #ifndef DTL_SES_H
 #define DTL_SES_H
 
+#include <utility>
+#include <vector>
+
 #include "dtl/variables.hpp"
 #include "dtl/Sequence.hpp"
 
@@ -48,7 +51,7 @@ namespace dtl {
  */
 template <typename elem> class Ses : public Sequence<elem> {
 private:
-  typedef pair<elem, elemInfo> sesElem;
+  typedef std::pair<elem, elemInfo> sesElem;
   typedef std::vector<sesElem> sesElemVec;
 
 public:

include/dtl/dtl.hpp

@@ -36,24 +36,6 @@
 #ifndef DTL_H
 #define DTL_H
 
-#include <algorithm>
-#include <cassert>
-#include <cstdio>
-#include <fstream>
-#include <iostream>
-#include <list>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif // HAVE_UNISTD_H
-
 #include "dtl/Diff.hpp"
 #include "dtl/Diff3.hpp"
 #include "dtl/Lcs.hpp"

include/dtl/functors.hpp

@@ -38,6 +38,8 @@
 #ifndef DTL_FUNCTORS_H
 #define DTL_FUNCTORS_H
 
+#include <iostream>
+
 #include "dtl/variables.hpp"
 
 namespace dtl {

include/dtl/variables.hpp

@@ -38,6 +38,12 @@
 #ifndef DTL_VARIABLES_H
 #define DTL_VARIABLES_H
 
+#include <algorithm>
+#include <iostream>
+#include <list>
+#include <string>
+#include <vector>
+
 namespace dtl {
 
 using std::cout;

test/dtl_test_common.hpp

@@ -1,6 +1,9 @@
 #ifndef DTL_TEST_COMMON
 #define DTL_TEST_COMMON
 
+#include <cstdio>
+#include <fstream>
+
 #include <gtest/gtest.h>
 
 #include "dtl/dtl.hpp"