From 842396976984e3cbd83251296dd90a46b9d53b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf=20Cl=C3=A9ment?= <c.wolf@kiwec.net>
Date: Thu, 3 Jan 2019 14:00:35 +0000
Subject: [PATCH] Downgrade to C++17, avoid stdlib

---
 Makefile         | 2 +-
 src/Buffer.cc    | 1 -
 src/Buffer.h     | 2 --
 src/Conversion.h | 5 +++--
 src/Document.cc  | 4 ++--
 src/Editor.h     | 1 +
 src/File.h       | 1 -
 src/Gutter.cc    | 2 +-
 src/History.h    | 1 -
 src/Line.cc      | 2 +-
 src/Line.h       | 2 ++
 src/Prompt.cc    | 1 -
 src/Prompt.h     | 1 -
 src/main.cc      | 8 ++++----
 14 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index d2e4909..dcde471 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ TESTS    = $(wildcard test/*.cc)
 TOBJ     = $(TESTS:.cc=.o)
 TDEP     = $(TOBJ:.o=.d)
 CXX      = clang
-CXXFLAGS = -std=c++1z
+CXXFLAGS = -std=c++17
 LDFLAGS  = -ltermbox -lstdc++ -lm
 TARGET   = ke
 TESTTGT  = ke-tests
diff --git a/src/Buffer.cc b/src/Buffer.cc
index 78b5ea2..4b133c5 100644
--- a/src/Buffer.cc
+++ b/src/Buffer.cc
@@ -1,4 +1,3 @@
-#include <sstream>
 #include <termbox.h>
 #include "Buffer.h"
 #include "Event.h"
diff --git a/src/Buffer.h b/src/Buffer.h
index 75f1fda..d2b7b8e 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -1,6 +1,4 @@
 #pragma once
-#include <memory>
-#include <stack>
 #include <string>
 #include <termbox.h>
 #include "Canvas.h"
diff --git a/src/Conversion.h b/src/Conversion.h
index 0e9bea1..2e51420 100644
--- a/src/Conversion.h
+++ b/src/Conversion.h
@@ -1,8 +1,9 @@
 #pragma once
-#include <cstdlib>
-#include <cstring>
+#include <stdlib.h>
+#include <string.h>
 #include <memory>
 
+// TODO remove unique_ptr
 namespace Convert {
 	std::unique_ptr<char[]> from_wide_string(const wchar_t* wide_string);
 	std::unique_ptr<wchar_t[]> to_wide_string(const char* multibyte_string);
diff --git a/src/Document.cc b/src/Document.cc
index e82255d..9779ac4 100644
--- a/src/Document.cc
+++ b/src/Document.cc
@@ -1,5 +1,5 @@
-#include <cmath>
-#include <cwchar>
+#include <math.h>
+#include <wchar.h>
 #include "Document.h"
 #include "Line.h"
 
diff --git a/src/Editor.h b/src/Editor.h
index c618fe5..efde616 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -3,6 +3,7 @@
 #include "Buffer.h"
 #include "StatusBar.h"
 
+// TODO remove shared_ptr
 class Editor : public InputHandler {
 private:
 	std::shared_ptr<Buffer> m_buf;
diff --git a/src/File.h b/src/File.h
index c597379..229b770 100644
--- a/src/File.h
+++ b/src/File.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <memory>
 #include <string>
 #include "Document.h"
 
diff --git a/src/Gutter.cc b/src/Gutter.cc
index 879d880..9365d39 100644
--- a/src/Gutter.cc
+++ b/src/Gutter.cc
@@ -1,4 +1,4 @@
-#include <cmath>
+#include <math.h>
 #include "Buffer.h"
 #include "Line.h"
 #include "Gutter.h"
diff --git a/src/History.h b/src/History.h
index dd7c518..13090f6 100644
--- a/src/History.h
+++ b/src/History.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <memory>
 #include <stack>
 #include "Event.h"
 
diff --git a/src/Line.cc b/src/Line.cc
index 1ede117..13fecfa 100644
--- a/src/Line.cc
+++ b/src/Line.cc
@@ -3,7 +3,7 @@
 #include "Document.h"
 #include "Editor.h"
 #include "Gutter.h"
-#include <cmath>
+#include <math.h>
 
 void Line::calc_size() {
   if(m_doc == nullptr) {
diff --git a/src/Line.h b/src/Line.h
index 9e56716..fcba29a 100644
--- a/src/Line.h
+++ b/src/Line.h
@@ -3,6 +3,8 @@
 #include <memory>
 #include "Syntax.h"
 
+// TODO remove unique_ptr
+
 class Buffer;
 class Text;
 using uint = uint32_t;
diff --git a/src/Prompt.cc b/src/Prompt.cc
index 6cc0a45..fc9dd6e 100644
--- a/src/Prompt.cc
+++ b/src/Prompt.cc
@@ -1,4 +1,3 @@
-#include <sstream>
 #include <wchar.h>
 #include "Editor.h"
 #include "Line.h"
diff --git a/src/Prompt.h b/src/Prompt.h
index 826dd89..3756799 100644
--- a/src/Prompt.h
+++ b/src/Prompt.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <functional>
-#include <memory>
 #include <termbox.h>
 #include <wchar.h>
 #include "Document.h"
diff --git a/src/main.cc b/src/main.cc
index a059023..0f6db98 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
-#include <iostream>
 #include <signal.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <termbox.h>
 #include <unistd.h>
@@ -17,13 +17,13 @@ int main(int argc, const char** argv) {
 	auto err = tb_init();
 	switch(err) {
 		case TB_EUNSUPPORTED_TERMINAL:
-		std::cerr << "Termbox: Unsupported terminal." << std::endl;
+		fprintf(stderr, "Termbox: Unsupported terminal.\n");
 		return 1;
 		case TB_EFAILED_TO_OPEN_TTY:
-		std::cerr << "Termbox: Failed to open tty." << std::endl;
+		fprintf(stderr, "Termbox: Failed to open tty.\n");
 		return 1;
 		case TB_EPIPE_TRAP_ERROR:
-		std::cerr << "Termbox: Pipe trap error." << std::endl;
+		fprintf(stderr, "Termbox: Pipe trap error.\n");
 		return 1;
 	}
 
-- 
2.34.2