Bump version in master to 2.6 after branching 2.5 beta

Signed-off-by: Larry Gritz <lg@larrygritz.com>
lgritz · Sep 5, 2023 · 3120d24 · 3120d24
1 parent a4a6113
commit 3120d24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 cmake_minimum_required (VERSION 3.15)
 
-set (OpenImageIO_VERSION "2.5.3.0")
+set (OpenImageIO_VERSION "2.6.0.0")
 set (OpenImageIO_VERSION_OVERRIDE "" CACHE STRING
      "Version override (use with caution)!")
 mark_as_advanced (OpenImageIO_VERSION_OVERRIDE)

diff --git a/src/include/OpenImageIO/ustring.h b/src/include/OpenImageIO/ustring.h
@@ -1051,11 +1051,9 @@ OIIO_DEVICE_CONSTEXPR ustringhash operator""_ush(const char* str,
 /// Deprecated -- This is too easy to confuse with the ustringhash class. And
 /// also it is unnecessary if you use std::hash<ustring>. This will be removed
 /// in OIIO 3.0.
-#    if OIIO_VERSION_GREATER_EQUAL(2, 6, 0)
-OIIO_DEPRECATED("Use std::hash<ustring> instead of ustringHash")
-#    endif
-
-using ustringHash = std::hash<ustring>;
+using ustringHash
+    OIIO_DEPRECATED("Use std::hash<ustring> instead of ustringHash")
+    = std::hash<ustring>;
 #endif