From 9de9d99d4dd4aa4798a6e07bc3273ad0eaa2c2d0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 22 Mar 2016 01:13:43 +0000
Subject: [PATCH] fixes

---
 ostd/range.hh  | 4 ++--
 ostd/string.hh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ostd/range.hh b/ostd/range.hh
index 56e77b6..5868b1b 100644
--- a/ostd/range.hh
+++ b/ostd/range.hh
@@ -488,7 +488,7 @@ template<typename B, typename C, typename V, typename R = V &,
         return (on - n);
     }
 
-    Size copy(RemoveConst<Value> *p, Size n = -1) {
+    Size copy(RemoveCv<Value> *p, Size n = -1) {
         B r(*((B *)this));
         Size on = n;
         for (; n && !r.empty(); --n) {
@@ -991,7 +991,7 @@ public:
         return orange.put_n(p_beg, c);
     }
 
-    Size copy(RemoveConst<T> *p, Size n = -1) {
+    Size copy(RemoveCv<T> *p, Size n = -1) {
         Size c = size();
         if (n < c) c = n;
         return copy(PointerRange(p, c), c);
diff --git a/ostd/string.hh b/ostd/string.hh
index c9e07c0..b22fe2f 100644
--- a/ostd/string.hh
+++ b/ostd/string.hh
@@ -853,7 +853,7 @@ String to_string(std::initializer_list<T> init) {
 template<typename R>
 struct TempCString {
 private:
-    using Value = RemoveConst<RangeValue<R>>;
+    using Value = RemoveCv<RangeValue<R>>;
     Value *p_buf;
     bool p_allocated;
 
@@ -893,7 +893,7 @@ public:
 };
 
 template<typename R>
-inline TempCString<R> to_temp_cstr(R input, RemoveConst<RangeValue<R>> *buf,
+inline TempCString<R> to_temp_cstr(R input, RemoveCv<RangeValue<R>> *buf,
                                    Size bufsize) {
     return TempCString<R>(input, buf, bufsize);
 }