Skip to content

Commit 37250b3

Browse files
authored
Merge pull request #517 from nepp95/release
Removed TINYGLTF_USE_CPP14 option since it is unused
2 parents 3564b48 + 7385235 commit 37250b3

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ if (!ret) {
194194
* `TINYGLTF_NO_INCLUDE_STB_IMAGE `: Disable including `stb_image.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
195195
* `TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE `: Disable including `stb_image_write.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
196196
* `TINYGLTF_USE_RAPIDJSON` : Use RapidJSON as a JSON parser/serializer. RapidJSON files are not included in TinyGLTF repo. Please set an include path to RapidJSON if you enable this feature.
197-
* `TINYGLTF_USE_CPP14` : Use C++14 feature(requires C++14 compiler). This may give better performance than C++11.
198197

199198

200199
## CMake options

tiny_gltf.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@
5050
#include <utility>
5151
#include <vector>
5252

53-
// Auto-detect C++14 standard version
54-
#if !defined(TINYGLTF_USE_CPP14) && defined(__cplusplus) && \
55-
(__cplusplus >= 201402L)
56-
#define TINYGLTF_USE_CPP14
57-
#endif
58-
5953
#ifdef __ANDROID__
6054
#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
6155
#include <android/asset_manager.h>

0 commit comments

Comments
 (0)