Merge pull request #37 from crupest/render

Refactor.

1 files changed, 32 insertions, 52 deletions

diff --git a/src/base.hpp b/src/base.hpp
index 64ce7f6e..e3dfc1ee 100644
--- a/src/base.hpp
+++ b/src/base.hpp
@@ -1,59 +1,39 @@
 #pragma once
-
-// ReSharper disable once CppUnusedIncludeDirective
 #include "pre.hpp"
 
-#include <string>
+#include <cassert>
+#include <chrono>
 #include <stdexcept>
+#include <string>
 #include <string_view>
-#include <chrono>
 
-namespace cru
-{
-    template<typename T> struct type_tag {};
-
-    //typedefs
-    using String = std::wstring;
-    using MultiByteString = std::string;
-
-    using StringView = std::wstring_view;
-    using MultiByteStringView = std::string_view;
-
-    using FloatSecond = std::chrono::duration<double, std::chrono::seconds::period>;
-
-    enum class FlowControl
-    {
-        Continue,
-        Break
-    };
-
-
-    class Object
-    {
-    public:
-        Object() = default;
-        Object(const Object&) = default;
-        Object& operator = (const Object&) = default;
-        Object(Object&&) = default;
-        Object& operator = (Object&&) = default;
-        virtual ~Object() = default;
-    };
-
-    struct Interface
-    {
-        virtual ~Interface() = default;
-    };
-
-    [[noreturn]] inline void UnreachableCode()
-    {
-        throw std::logic_error("Unreachable code.");
-    }
-
-    MultiByteString ToUtf8String(const StringView& string);
-
-    inline void Require(const bool condition, const MultiByteStringView& error_message)
-    {
-        if (!condition)
-            throw std::invalid_argument(error_message.data());
-    }
+namespace cru {
+// typedefs
+using String = std::wstring;
+using MultiByteString = std::string;
+
+using StringView = std::wstring_view;
+using MultiByteStringView = std::string_view;
+
+using FloatSecond = std::chrono::duration<double, std::chrono::seconds::period>;
+
+enum class FlowControl { Continue, Break };
+
+class Object {
+ public:
+  Object() = default;
+  Object(const Object&) = default;
+  Object& operator=(const Object&) = default;
+  Object(Object&&) = default;
+  Object& operator=(Object&&) = default;
+  virtual ~Object() = default;
+};
+
+struct Interface {
+  virtual ~Interface() = default;
+};
+
+[[noreturn]] inline void UnreachableCode() {
+  throw std::logic_error("Unreachable code.");
 }
+}  // namespace cru