From 5c261ed7edf0e3b5a1d5e861e388b5b17e53554d Mon Sep 17 00:00:00 2001
From: rexy712 <rexy712@protonmail.com>
Date: Sat, 21 May 2022 09:58:26 -0700
Subject: [PATCH] Update to new librexy

---
 rjp++/include/member.hpp     | 8 ++++----
 rjp++/include/string_val.hpp | 2 +-
 rjp++/include/value.hpp      | 2 +-
 rjp++/src/string_val.cpp     | 4 ++--
 rjp++/src/vget_proxy.cpp     | 2 +-
 rjp++/tests/output.cpp       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rjp++/include/member.hpp b/rjp++/include/member.hpp
index b9cd2a0..8ebb7bd 100644
--- a/rjp++/include/member.hpp
+++ b/rjp++/include/member.hpp
@@ -52,8 +52,8 @@ namespace rjp{
 		member& operator=(const member&) = default;
 		member& operator=(member&&) = default;
 
-		rexy::string_view<char> key(void)const{
-			return rexy::string_view<char>(member_key(this->m_value)->value, member_key(this->m_value)->length);
+		rexy::string_view key(void)const{
+			return rexy::string_view(member_key(this->m_value)->value, member_key(this->m_value)->length);
 		}
 		string steal_key(void){
 			return string(this->m_value);
@@ -76,8 +76,8 @@ namespace rjp{
 		member& operator=(const member&) = default;
 		member& operator=(member&&) = default;
 
-		rexy::string_view<char> key(void)const{
-			return rexy::string_view<char>(member_key(m_value)->value, member_key(m_value)->length);
+		rexy::string_view key(void)const{
+			return rexy::string_view(member_key(m_value)->value, member_key(m_value)->length);
 		}
 		string steal_key(void){
 			return string(m_value);
diff --git a/rjp++/include/string_val.hpp b/rjp++/include/string_val.hpp
index 8470e74..9e797c3 100644
--- a/rjp++/include/string_val.hpp
+++ b/rjp++/include/string_val.hpp
@@ -48,7 +48,7 @@ namespace rjp{
 		string_val& operator=(const string_val&) = default;
 		string_val& operator=(string_val&&) = default;
 
-		rexy::string_view<char> get(void)const;
+		rexy::string_view get(void)const;
 		string steal(void);
 		void set(const rexy::string_base<char>& str);
 		void set(string&& str);
diff --git a/rjp++/include/value.hpp b/rjp++/include/value.hpp
index b4e87f2..3f48697 100644
--- a/rjp++/include/value.hpp
+++ b/rjp++/include/value.hpp
@@ -35,7 +35,7 @@ namespace rjp{
 			vget_proxy(const rjp::value* v);
 			operator int(void)const;
 			operator bool(void)const;
-			operator rexy::string_view<char>(void)const;
+			operator rexy::string_view(void)const;
 			operator double(void)const;
 		};
 	}
diff --git a/rjp++/src/string_val.cpp b/rjp++/src/string_val.cpp
index a4244f6..b518332 100644
--- a/rjp++/src/string_val.cpp
+++ b/rjp++/src/string_val.cpp
@@ -70,9 +70,9 @@ namespace rjp{
 		rjp_set_string_steal(m_value, i.release(), length);
 	}
 
-	rexy::string_view<char> string_val::get(void)const{
+	rexy::string_view string_val::get(void)const{
 		const RJP_string* str = rjp_get_cstring(m_value);
-		return rexy::string_view<char>(str->value, str->length);
+		return rexy::string_view(str->value, str->length);
 	}
 	string string_val::steal(void){
 		return string(m_value);
diff --git a/rjp++/src/vget_proxy.cpp b/rjp++/src/vget_proxy.cpp
index e1a4c6a..9423f88 100644
--- a/rjp++/src/vget_proxy.cpp
+++ b/rjp++/src/vget_proxy.cpp
@@ -32,7 +32,7 @@ namespace rjp::detail{
 	vget_proxy::operator bool(void)const{
 		return rjp::borrow_as<rjp::boolean>(*m_value).get();
 	}
-	vget_proxy::operator rexy::string_view<char>(void)const{
+	vget_proxy::operator rexy::string_view(void)const{
 		return rjp::borrow_as<rjp::string_val>(*m_value).get();
 	}
 	vget_proxy::operator double(void)const{
diff --git a/rjp++/tests/output.cpp b/rjp++/tests/output.cpp
index 4d4128a..0dc3348 100644
--- a/rjp++/tests/output.cpp
+++ b/rjp++/tests/output.cpp
@@ -123,7 +123,7 @@ rjp::value case_19(void){
 	arr.add<rjp::integer>(5);
 	rjp::object subobj = arr.add<rjp::object>();
 	for(int i = 0;i < 10;++i){
-		subobj.add<rjp::boolean>(rexy::string_view<char>(c), i % 2 == 0);
+		subobj.add<rjp::boolean>(rexy::string_view(c), i % 2 == 0);
 		c[3] += 1;
 	}
 	return rjp::steal_as<rjp::value>(arr);