1 files changed, 11 insertions, 84 deletions

diff --git a/src/base.h b/src/base.h
index 0a77e5b9..c8866cf6 100644
--- a/src/base.h
+++ b/src/base.h
@@ -4,23 +4,12 @@
 #include "global_macros.h"
 
 
-#ifdef CRU_DEBUG
 #include <string>
-#include <vector>
-#else
-#include <folly/String.h>
-#include <folly/FBVector.h>
-#endif
-
-#include <folly/Function.h>
-
-#include <utility>
 #include <type_traits>
 #include <stdexcept>
 #include <memory>
 #include <string_view>
 #include <chrono>
-#include <list>
 
 namespace cru
 {
@@ -28,59 +17,23 @@ namespace cru
     template<typename T> struct is_shared_ptr<std::shared_ptr<T>> : std::true_type {};
     template<typename T> constexpr bool is_shared_ptr_v = is_shared_ptr<T>::value;
 
-    enum class FlowControl
-    {
-        Continue,
-        Break
-    };
+    template<typename T> struct type_tag {};
 
-#ifdef CRU_DEBUG
+    //typedefs
     using String = std::wstring;
     using MultiByteString = std::string;
-#else
-    using String = folly::basic_fbstring<wchar_t>;
-    using MultiByteString = folly::fbstring;
-#endif
 
     using StringView = std::wstring_view;
     using MultiByteStringView = std::string_view;
 
-    template<typename FunctionType>
-    using Function = folly::Function<FunctionType>;
-
-    template<typename FunctionType>
-    using FunctionPtr = std::shared_ptr<Function<FunctionType>>;
-
-    using Action = Function<void()>;
-    using ActionPtr = FunctionPtr<void()>;
-
-    template<typename Type, typename... Args>
-    Type CreatePtr(Args&&... args)
-    {
-        static_assert(is_shared_ptr_v<Type>);
-        return std::make_shared<typename Type::element_type>(std::forward<Args>(args)...);
-    }
-
-    template<typename Type>
-    FunctionPtr<Type> CreateFunctionPtr(Function<Type>&& function)
-    {
-        return std::make_shared<Function<Type>>(std::move(function));
-    }
+    using FloatSecond = std::chrono::duration<double, std::chrono::seconds::period>;
 
-    inline ActionPtr CreateActionPtr(Action&& action)
+    enum class FlowControl
     {
-        return std::make_shared<Action>(std::move(action));
-    }
-
-#ifdef CRU_DEBUG
-    template<typename T>
-    using Vector = std::vector<T>;
-#else
-    template<typename T>
-    using Vector = folly::fbvector<T>;
-#endif
+        Continue,
+        Break
+    };
 
-    using FloatSecond = std::chrono::duration<double, std::chrono::seconds::period>;
 
     class Object
     {
@@ -103,37 +56,11 @@ namespace cru
         throw std::logic_error("Unreachable code.");
     }
 
-    struct ICancelable : virtual Interface
-    {
-        virtual void Cancel() = 0;
-    };
-
-    using CancelablePtr = std::shared_ptr<ICancelable>;
-
     MultiByteString ToUtf8String(const StringView& string);
 
-
-    class PropertyChangedNotifyObject : public Object
+    inline void Require(const bool condition, const MultiByteStringView& error_message)
     {
-    public:
-        using PropertyChangedHandler = Function<void(const StringView&)>;
-        using PropertyChangedHandlerPtr = FunctionPtr<void(const StringView&)>;
-
-        PropertyChangedNotifyObject() = default;
-        PropertyChangedNotifyObject(const PropertyChangedNotifyObject& other) = delete;
-        PropertyChangedNotifyObject(PropertyChangedNotifyObject&& other) = delete;
-        PropertyChangedNotifyObject& operator = (const PropertyChangedNotifyObject& other) = delete;
-        PropertyChangedNotifyObject& operator = (PropertyChangedNotifyObject&& other) = delete;
-        ~PropertyChangedNotifyObject() override = default;
-
-        void AddPropertyChangedListener(FunctionPtr<void(const StringView&)> listener);
-
-        void RemovePropertyChangedListener(const FunctionPtr<void(const StringView&)>& listener);
-
-    protected:
-        void RaisePropertyChangedEvent(const StringView& property_name);
-
-    private:
-        std::list<FunctionPtr<void(const StringView&)>> listeners_;
-    };
+        if (!condition)
+            throw std::invalid_argument(error_message.data());
+    }
 }