From 1383491c9b9f54816a335e01c107a3a98f1e60a8 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Mon, 4 Sep 2023 17:49:14 -0700 Subject: [PATCH] Stage for 2.5.3.0-beta1 Signed-off-by: Larry Gritz --- CMakeLists.txt | 4 ++-- src/include/OpenImageIO/ustring.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9b7aacd92..baaf2600c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,12 +19,12 @@ project (OpenImageIO VERSION ${OpenImageIO_VERSION} set (PROJ_NAME OIIO) # short name, caps string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER) # short name lower case string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER) # short name upper case -set (PROJECT_VERSION_RELEASE_TYPE "dev" CACHE STRING +set (PROJECT_VERSION_RELEASE_TYPE "beta" CACHE STRING "Build type, for example: dev, beta2, RC1 (empty string for normal release)") set (${PROJECT_NAME}_VERSION_RELEASE_TYPE ${PROJECT_VERSION_RELEASE_TYPE}) set (PROJECT_AUTHORS "Contributors to the OpenImageIO project") option (${PROJECT_NAME}_SUPPORTED_RELEASE - "Set ON for supported release branch, OFF for master" OFF) + "Set ON for supported release branch, OFF for master" ON) if (${PROJECT_NAME}_SUPPORTED_RELEASE) set (${PROJECT_NAME}_DEV_RELEASE OFF) else () diff --git a/src/include/OpenImageIO/ustring.h b/src/include/OpenImageIO/ustring.h index bedadde5c0..7c56b53fa2 100644 --- a/src/include/OpenImageIO/ustring.h +++ b/src/include/OpenImageIO/ustring.h @@ -1051,10 +1051,6 @@ 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. This will be removed /// in OIIO 3.0. -# if OIIO_VERSION_GREATER_EQUAL(2, 6, 0) -OIIO_DEPRECATED("Use std::hash instead of ustringHash") -# endif - using ustringHash = std::hash; #endif