diff --git a/src/nostalgia/geo/vec.hpp b/src/nostalgia/geo/vec.hpp index 0af815f1..586297f8 100644 --- a/src/nostalgia/geo/vec.hpp +++ b/src/nostalgia/geo/vec.hpp @@ -32,7 +32,7 @@ struct Vec { T y = 0; template - struct iterator: public std::iterator { + struct iterator: public ox::Iterator { private: PtrType m_t = nullptr; size_type m_offset = 0; @@ -60,7 +60,7 @@ struct Vec { } } - constexpr typename std::iterator::difference_type + constexpr typename ox::Iterator::difference_type operator-(const iterator &other) const noexcept { if constexpr(reverse) { return m_offset + other.m_offset; diff --git a/src/nostalgia/studio/lib/project.cpp b/src/nostalgia/studio/lib/project.cpp index bc334939..66bc7cfe 100644 --- a/src/nostalgia/studio/lib/project.cpp +++ b/src/nostalgia/studio/lib/project.cpp @@ -2,6 +2,7 @@ * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved. */ +#include #include #include diff --git a/src/nostalgia/studio/lib/project.hpp b/src/nostalgia/studio/lib/project.hpp index 23a0e2aa..e65d095a 100644 --- a/src/nostalgia/studio/lib/project.hpp +++ b/src/nostalgia/studio/lib/project.hpp @@ -27,8 +27,8 @@ enum class ProjectEvent { }; [[nodiscard]] -constexpr ox::Result fileExt(auto path) noexcept { - const auto extStart = std::find(path.crbegin(), path.crend(), '.').offset(); +constexpr ox::Result fileExt(const ox::String &path) noexcept { + const auto extStart = ox::find(path.crbegin(), path.crend(), '.').offset(); if (!extStart) { return OxError(1, "Cannot open a file without valid extension."); }