From a1762774254bd4484415053c685e1b3faf17611a Mon Sep 17 00:00:00 2001
From: "Pavel I. Kryukov" <kryukov@frtk.ru>
Date: Thu, 16 May 2019 11:57:44 +0300
Subject: [PATCH] Delete string_view.h

---
 readme.md                                     |  2 +-
 simulator/func_sim/operation.h                |  2 +-
 simulator/infra/exception.h                   |  3 +--
 simulator/infra/string_view.h                 | 26 -------------------
 simulator/mips/mips_instr.h                   |  2 +-
 simulator/mips/mips_register/mips_register.h  |  3 +--
 .../risc_v/riscv_register/riscv_register.h    |  3 +--
 7 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 simulator/infra/string_view.h

diff --git a/readme.md b/readme.md
index 13ff51d93..256577ce4 100644
--- a/readme.md
+++ b/readme.md
@@ -34,7 +34,7 @@ More details about internals are available on [Wiki](https://github.com/MIPT-ILa
 We use C++17 features and Boost 1.61. Thus, you have to [use compilers](https://github.com/MIPT-ILab/mipt-mips/wiki/C-compilers) of these versions or newer:
 * GCC 7
 * Clang 5.0
-* Apple LLVM 7.3.0
+* Apple LLVM Version 10.0.0
 * MS Visual Studio 2017 (Boost 1.66 and CMake 3.10.2 are required)
 
 [Install Boost](https://github.com/MIPT-ILab/mipt-mips/wiki/Required-libraries) before building the project.
diff --git a/simulator/func_sim/operation.h b/simulator/func_sim/operation.h
index 88279bed5..176b7c7c0 100644
--- a/simulator/func_sim/operation.h
+++ b/simulator/func_sim/operation.h
@@ -9,11 +9,11 @@
 
 #include <func_sim/traps/trap.h>
 #include <infra/macro.h>
-#include <infra/string_view.h>
 #include <infra/types.h>
 
 #include <cassert>
 #include <sstream>
+#include <string_view>
 
 enum OperationType : uint8
 {
diff --git a/simulator/infra/exception.h b/simulator/infra/exception.h
index 34132fce8..89ebb680d 100644
--- a/simulator/infra/exception.h
+++ b/simulator/infra/exception.h
@@ -7,10 +7,9 @@
 #ifndef EXCEPTION_H
 #define EXCEPTION_H
 
-#include <infra/string_view.h>
-
 #include <stdexcept>
 #include <string>
+#include <string_view>
 
 struct Exception : std::runtime_error
 {
diff --git a/simulator/infra/string_view.h b/simulator/infra/string_view.h
deleted file mode 100644
index aefa6895c..000000000
--- a/simulator/infra/string_view.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * string_view.h - definition of string_view for old libc++
- * @author Pavel Kryukov
- * Copyright 2017-2019 MIPT-MIPS team
- */
-
-#ifndef STRING_VIEW_H
-#define STRING_VIEW_H
-
-#include <iostream>
-
-#if __has_include("string_view")
-#include <string_view>
-#else
-#include <experimental/string_view>
-namespace std {
-    using string_view = std::experimental::string_view;
-
-    template<typename CharT, typename Traits = std::char_traits<CharT>>
-    using basic_string_view = std::experimental::basic_string_view<CharT, Traits>;
-
-    std::ostream& operator<<(std::ostream&, const std::experimental::string_view&);
-}
-#endif
-
-#endif // STRING_VIEW_H
diff --git a/simulator/mips/mips_instr.h b/simulator/mips/mips_instr.h
index db88b52ef..26ba699fb 100644
--- a/simulator/mips/mips_instr.h
+++ b/simulator/mips/mips_instr.h
@@ -14,10 +14,10 @@
 #include <func_sim/operation.h>
 #include <infra/endian.h>
 #include <infra/exception.h>
-#include <infra/string_view.h>
 #include <infra/types.h>
 
 #include <sstream>
+#include <string_view>
 
 template<typename I>
 struct MIPSTableEntry;
diff --git a/simulator/mips/mips_register/mips_register.h b/simulator/mips/mips_register/mips_register.h
index 9c3b35b73..fcbc9ab80 100644
--- a/simulator/mips/mips_register/mips_register.h
+++ b/simulator/mips/mips_register/mips_register.h
@@ -6,13 +6,12 @@
 #ifndef MIPS_REG_H
 #define MIPS_REG_H
 
-// MIPT-MIPS modules
 #include <infra/macro.h>
-#include <infra/string_view.h>
 #include <infra/types.h>
 
 #include <array>
 #include <cassert>
+#include <string_view>
 #include <iostream>
 #include <utility>
 
diff --git a/simulator/risc_v/riscv_register/riscv_register.h b/simulator/risc_v/riscv_register/riscv_register.h
index 27dfeafd0..a5e02f214 100644
--- a/simulator/risc_v/riscv_register/riscv_register.h
+++ b/simulator/risc_v/riscv_register/riscv_register.h
@@ -6,13 +6,12 @@
 #ifndef RISCV_REG_H
 #define RISCV_REG_H
 
-// MIPT-MIPS modules
 #include <infra/macro.h>
-#include <infra/string_view.h>
 #include <infra/types.h>
 
 #include <array>
 #include <cassert>
+#include <string_view>
 #include <iostream>
 #include <utility>