Mirrors/tinyusdz
0
0
Fork 0
mirror of https://github.com/lighttransport/tinyusdz.git synced 2026-01-18 01:11:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

raise C++ version requirement from C++14 to C++17

Browse Source 
Update all CMakeLists.txt, Makefiles, meson.build, setup.py,
and documentation files to use C++17 standard.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Syoyo Fujita
2026-01-08 03:39:41 +09:00
parent ee72c871cd
commit 3c1b1735b7
29 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -315,15 +315,10 @@ if (PROJECT_IS_TOP_LEVEL)
#set(CMAKE_CXX_STANDARD 17) # nanobind requires C++17 #set(CMAKE_CXX_STANDARD 17) # nanobind requires C++17
# for pybind11 # for pybind11
set(CMAKE_CXX_STANDARD 14)
else()
if (TINYUSDZ_MSAN)
# Require strict C++17 or later for MSAN build
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
else() else()
# Require strict C++14 mode(e.g. `-std=c++14`) # Require strict C++17 mode(e.g. `-std=c++17`)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
endif()
endif() endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

2
doc/PACKED_ARRAY_OPTIMIZATION.md
View File

@@ -203,7 +203,7 @@ All functionality is verified in `test_packed_array.cc`:
Run tests: Run tests:
```bash ```bash
g++ -std=c++14 -I. test_packed_array.cc -o test_packed_array g++ -std=c++17 -I. test_packed_array.cc -o test_packed_array
./test_packed_array ./test_packed_array
``` ```

2
examples/openglviewer/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ set(BUILD_TARGET "usdz_glview")
project(${BUILD_TARGET} CXX C) project(${BUILD_TARGET} CXX C)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED On) set(CMAKE_CXX_STANDARD_REQUIRED On)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

2
examples/optixviewer/CMakeLists.txt
View File

@@ -14,7 +14,7 @@ endif()
set(OptiX_INSTALL_DIR ${DEFAULT_OPTIX_INSTALL_DIR} CACHE PATH "Path to OptiX installed location.") set(OptiX_INSTALL_DIR ${DEFAULT_OPTIX_INSTALL_DIR} CACHE PATH "Path to OptiX installed location.")
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)

4
examples/pxrusd/CMakeLists.txt
View File

@@ -20,8 +20,8 @@ find_package(Sanitizers) # Address sanitizer (-DSANITIZE_ADDRESS=ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
# Require strict C++14 # Require strict C++17
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

4
examples/sdlviewer/CMakeLists.txt
View File

@@ -26,8 +26,8 @@ endif()
# Use embedded version of OpenSubdiv code by default # Use embedded version of OpenSubdiv code by default
set(osd_DIR ${PROJECT_SOURCE_DIR}/../../src/osd) set(osd_DIR ${PROJECT_SOURCE_DIR}/../../src/osd)
# imgui_sdl requires C++14 # imgui_sdl requires C++17
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

2
sandbox/abi3/CMakeLists.txt
View File

@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.15)
project(tinyusdz_abi3 C CXX) project(tinyusdz_abi3 C CXX)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
# Options # Options
option(BUILD_SHARED_LIBS "Build shared library" ON) option(BUILD_SHARED_LIBS "Build shared library" ON)

6
sandbox/abi3/setup.py
View File

@@ -30,15 +30,15 @@ class BuildExt(build_ext):
"""Custom build extension to set ABI3 flags""" """Custom build extension to set ABI3 flags"""
def build_extensions(self): def build_extensions(self):
# Set C++14 standard # Set C++17 standard
if self.compiler.compiler_type == 'unix': if self.compiler.compiler_type == 'unix':
for ext in self.extensions: for ext in self.extensions:
ext.extra_compile_args.append('-std=c++14') ext.extra_compile_args.append('-std=c++17')
# Enable ABI3 limited API # Enable ABI3 limited API
ext.define_macros.append(('Py_LIMITED_API', '0x030a0000')) ext.define_macros.append(('Py_LIMITED_API', '0x030a0000'))
elif self.compiler.compiler_type == 'msvc': elif self.compiler.compiler_type == 'msvc':
for ext in self.extensions: for ext in self.extensions:
ext.extra_compile_args.append('/std:c++14') ext.extra_compile_args.append('/std:c++17')
# Enable ABI3 limited API # Enable ABI3 limited API
ext.define_macros.append(('Py_LIMITED_API', '0x030a0000')) ext.define_macros.append(('Py_LIMITED_API', '0x030a0000'))

2
sandbox/mtlx-parser/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(mtlx-parser) project(mtlx-parser)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Add include directories # Add include directories

4
sandbox/new-c-api/CMakeLists.txt
View File

@@ -5,8 +5,8 @@ project(tinyusdz_c VERSION 1.0.0 LANGUAGES C CXX)
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD_REQUIRED ON)
# C++14 for the implementation # C++17 for the implementation
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Options # Options

2
sandbox/new-c-api/Makefile
View File

@@ -7,7 +7,7 @@ AR = ar
# Flags # Flags
CFLAGS = -std=c99 -Wall -Wextra -O2 -fPIC CFLAGS = -std=c99 -Wall -Wextra -O2 -fPIC
CXXFLAGS = -std=c++14 -Wall -Wextra -O2 -fPIC CXXFLAGS = -std=c++17 -Wall -Wextra -O2 -fPIC
LDFLAGS = -shared LDFLAGS = -shared
# Paths # Paths

2
sandbox/primvar_type/Makefile
View File

@@ -1,2 +1,2 @@
all: all:
clang++ -Weverything -fsanitize=address -Wall -Wno-c++98-compat -Wno-padded -std=c++14 -fno-rtti -fno-exceptions -g main.cc ../../src/external/staticstruct.cc clang++ -Weverything -fsanitize=address -Wall -Wno-c++98-compat -Wno-padded -std=c++17 -fno-rtti -fno-exceptions -g main.cc ../../src/external/staticstruct.cc

2
sandbox/print_fp/Makefile
View File

@@ -1,4 +1,4 @@
all: all:
g++ -O2 -g -std=c++14 print_fp.cc -I ../../src/external/dragonbox/ ../../src/external/dragonbox/dragonbox_to_chars.cpp -I../../src/external -o print_fp g++ -O2 -g -std=c++17 print_fp.cc -I ../../src/external/dragonbox/ ../../src/external/dragonbox/dragonbox_to_chars.cpp -I../../src/external -o print_fp
#clang++ -O2 -g print_fp.cc -I ../../src/external/dragonbox/ ../../src/external/dragonbox/dragonbox_to_chars.cpp -I../../src/external #clang++ -O2 -g print_fp.cc -I ../../src/external/dragonbox/ ../../src/external/dragonbox/dragonbox_to_chars.cpp -I../../src/external
#clang++ -O2 -g print_fp.cc -I ../../src/external/ #clang++ -O2 -g print_fp.cc -I ../../src/external/

2
sandbox/reflection/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
project(FlexibleReflection) project(FlexibleReflection)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
add_executable(FlexibleReflection main.cc Primitives.cpp Reflect.h) add_executable(FlexibleReflection main.cc Primitives.cpp Reflect.h)

4
sandbox/simple_variant/Makefile
View File

@@ -1,3 +1,3 @@
all: all:
#clang++ -std=c++14 -I../../src tusdz-variant.cc #clang++ -std=c++17 -I../../src tusdz-variant.cc
clang++ -std=c++14 -I../../src main.cc clang++ -std=c++17 -I../../src main.cc

2
sandbox/static_any/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(static_any_test) project(static_any_test)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_executable(test_static_any test_static_any.cc) add_executable(test_static_any test_static_any.cc)

2
sandbox/task-queue/IMPLEMENTATION.md
View File

@@ -208,5 +208,5 @@ This makes it suitable for:
Example compilation: Example compilation:
```bash ```bash
g++ -std=c++14 -fno-exceptions -fno-rtti -pthread -O2 example.cc -o example g++ -std=c++17 -fno-exceptions -fno-rtti -pthread -O2 example.cc -o example
``` ```

6
sandbox/task-queue/Makefile
View File

@@ -1,7 +1,7 @@
CXX ?= g++ CXX ?= g++
CXXFLAGS = -std=c++14 -Wall -Wextra -O2 -pthread CXXFLAGS = -std=c++17 -Wall -Wextra -O2 -pthread
CXXFLAGS_DEBUG = -std=c++14 -Wall -Wextra -g -O0 -pthread -fsanitize=thread CXXFLAGS_DEBUG = -std=c++17 -Wall -Wextra -g -O0 -pthread -fsanitize=thread
CXXFLAGS_NO_EXCEPT = -std=c++14 -Wall -Wextra -O2 -pthread -fno-exceptions -fno-rtti CXXFLAGS_NO_EXCEPT = -std=c++17 -Wall -Wextra -O2 -pthread -fno-exceptions -fno-rtti
TARGET = task_queue_example TARGET = task_queue_example
TARGET_DEBUG = task_queue_example_debug TARGET_DEBUG = task_queue_example_debug

2
sandbox/task-queue/README.md
View File

@@ -112,7 +112,7 @@ The implementation is designed to work without C++ exceptions or RTTI:
To verify: To verify:
```bash ```bash
g++ -std=c++14 -fno-exceptions -fno-rtti -c task-queue.hh g++ -std=c++17 -fno-exceptions -fno-rtti -c task-queue.hh
``` ```
## Example Output ## Example Output

11
sandbox/task-queue/VERIFICATION.md
View File

@@ -40,13 +40,13 @@ The header file `task-queue.hh` contains:
### Test 1: Header Compilation ### Test 1: Header Compilation
```bash ```bash
g++ -std=c++14 -fno-exceptions -fno-rtti -c task-queue.hh g++ -std=c++17 -fno-exceptions -fno-rtti -c task-queue.hh
``` ```
**Result**: ✅ PASSED (compiles without errors) **Result**: ✅ PASSED (compiles without errors)
### Test 2: Full Example Compilation ### Test 2: Full Example Compilation
```bash ```bash
g++ -std=c++14 -Wall -Wextra -O2 -pthread -fno-exceptions -fno-rtti example.cc -o task_queue_example_no_except g++ -std=c++17 -Wall -Wextra -O2 -pthread -fno-exceptions -fno-rtti example.cc -o task_queue_example_no_except
``` ```
**Result**: ✅ PASSED (compiles without errors or warnings) **Result**: ✅ PASSED (compiles without errors or warnings)
@@ -115,19 +115,18 @@ The implementation successfully uses:
- **Multi-threaded**: Lock-free CAS operations, no mutex contention - **Multi-threaded**: Lock-free CAS operations, no mutex contention
- **Scalability**: Tested up to 8 concurrent threads (4P+4C) - **Scalability**: Tested up to 8 concurrent threads (4P+4C)
## C++14 Compatibility ## C++17 Compatibility
The implementation uses only C++14 standard features: The implementation uses only C++17 standard features:
- ✅ `std::atomic` (C++11) - ✅ `std::atomic` (C++11)
- ✅ `std::function` (C++11) - ✅ `std::function` (C++11)
- ✅ `std::mutex` and `std::lock_guard` (C++11, fallback only) - ✅ `std::mutex` and `std::lock_guard` (C++11, fallback only)
- ✅ `std::thread` (C++11, tests only) - ✅ `std::thread` (C++11, tests only)
- ✅ Lambda expressions (C++11) - ✅ Lambda expressions (C++11)
- ✅ No C++17 or later features
Verified with: Verified with:
```bash ```bash
g++ -std=c++14 -Werror=c++17-extensions ... g++ -std=c++17 ...
``` ```
## Dependencies ## Dependencies

2
sandbox/threejs/CMakeLists.txt
View File

@@ -9,7 +9,7 @@ endif()
project(${BUILD_TARGET} CXX C) project(${BUILD_TARGET} CXX C)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

2
src/osd/opensubdiv/CMakeLists.txt
View File

@@ -80,7 +80,7 @@ if (NOT NO_LIB)
list(APPEND PLATFORM_GPU_LIBRARIES list(APPEND PLATFORM_GPU_LIBRARIES
${METAL_LIBRARIES} ${METAL_LIBRARIES}
) )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
endif() endif()
if ( OPENCL_FOUND ) if ( OPENCL_FOUND )

2
tests/feat/mtlx/Makefile
View File

@@ -15,7 +15,7 @@ BUILD_DIR = $(ROOT_DIR)/build
# Compiler settings # Compiler settings
CXX ?= g++ CXX ?= g++
CXXFLAGS = -std=c++14 -Wall -O2 CXXFLAGS = -std=c++17 -Wall -O2
INCLUDES = -I$(SRC_DIR) \ INCLUDES = -I$(SRC_DIR) \
-I$(INCLUDE_DIR) \ -I$(INCLUDE_DIR) \
-I$(EXTERNAL_DIR)/jsonhpp -I$(EXTERNAL_DIR)/jsonhpp

2
tests/feat/mtlx/Makefile.grouped_params
View File

@@ -1,5 +1,5 @@
CXX = g++ CXX = g++
CXXFLAGS = -std=c++14 -I../../../src -I../../../ CXXFLAGS = -std=c++17 -I../../../src -I../../../
LDFLAGS = -L../../../build -ltinyusdz_static -lpthread LDFLAGS = -L../../../build -ltinyusdz_static -lpthread
test_grouped_params: test_grouped_params.cc test_grouped_params: test_grouped_params.cc

2
tests/feat/typed-array-factories/Makefile
View File

@@ -2,7 +2,7 @@
# Standalone test that can be built without CMake # Standalone test that can be built without CMake
CXX = g++-13 CXX = g++-13
CXXFLAGS = -std=c++14 -Wall -Wextra -O2 -g CXXFLAGS = -std=c++17 -Wall -Wextra -O2 -g
INCLUDES = -I../../../src INCLUDES = -I../../../src
# Source files # Source files

2
tests/feat/typed-array-factories/README.md
View File

@@ -55,7 +55,7 @@ make clean
### Manual Compilation ### Manual Compilation
```bash ```bash
g++-13 -std=c++14 -I../../../src test-typed-array-factories.cc -o test-typed-array-factories g++-13 -std=c++17 -I../../../src test-typed-array-factories.cc -o test-typed-array-factories
./test-typed-array-factories ./test-typed-array-factories
``` ```

2
tests/feat/typed-array-timesamples/Makefile
View File

@@ -6,7 +6,7 @@
# Compiler settings # Compiler settings
CXX ?= g++ CXX ?= g++
CXXFLAGS = -std=c++14 -Wall -Wextra -O2 -g CXXFLAGS = -std=c++17 -Wall -Wextra -O2 -g
INCLUDES = -I../../../src -I../../../src/external INCLUDES = -I../../../src -I../../../src/external
# TinyUSDZ root directory (3 levels up from this Makefile) # TinyUSDZ root directory (3 levels up from this Makefile)

2
tests/feat/typed-array-view/Makefile
View File

@@ -1,7 +1,7 @@
# Makefile for TypedArrayView test # Makefile for TypedArrayView test
CXX = g++ CXX = g++
CXXFLAGS = -std=c++14 -Wall -Wextra -I../../../ -I../../../src CXXFLAGS = -std=c++17 -Wall -Wextra -I../../../ -I../../../src
LDFLAGS = LDFLAGS =
# Source files # Source files

2
tests/fuzzer/meson.build
View File

@@ -1,4 +1,4 @@
project('fuzz_tinyusdz', 'c', 'cpp', default_options : ['cpp_std=c++14']) project('fuzz_tinyusdz', 'c', 'cpp', default_options : ['cpp_std=c++17'])
tinyusdz_sources=[ tinyusdz_sources=[
'../../src/asset-resolution.cc', '../../src/asset-resolution.cc',