GitHub-Proxy/draco
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/google/draco synced 2025-08-12 21:49:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

draco: StdioFileReader/Writer gcc 4.9/clang < 4 compatibility fix.

Browse Source 
Fixes https://github.com/google/draco/issues/582
This commit is contained in:
Tom Finegan 2020-03-03 15:00:59 -08:00
parent eed8cdf588
commit b7fb7e5fba
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -58,9 +58,12 @@ option(BUILD_FOR_GLTF "" OFF)
option(BUILD_MAYA_PLUGIN "Build plugin library for Maya." OFF) option(BUILD_MAYA_PLUGIN "Build plugin library for Maya." OFF)
option(BUILD_USD_PLUGIN "Build plugin library for USD." OFF) option(BUILD_USD_PLUGIN "Build plugin library for USD." OFF)
if(${CMAKE_CXX_COMPILER_ID} MATCHES GNU if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU"
AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5) AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5)
message(WARNING "GNU/GCC VERSION LESS THAN 5, ENABLING COMPATIBILITY MODE.") OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"
AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4))
message(WARNING
"GNU/GCC < v5 or Clang/LLVM < v4, ENABLING COMPATIBILITY MODE.")
draco_enable_feature(FEATURE "DRACO_OLD_GCC") draco_enable_feature(FEATURE "DRACO_OLD_GCC")
endif() endif()

5
src/draco/io/stdio_file_reader.cc
View File

@ -11,6 +11,7 @@
#include <io.h> #include <io.h>
#endif #endif
#include "draco/draco_features.h"
#include "draco/io/file_reader_factory.h" #include "draco/io/file_reader_factory.h"
namespace draco { namespace draco {
@ -46,7 +47,11 @@ std::unique_ptr<FileReaderInterface> StdioFileReader::Open(
return nullptr; return nullptr;
} }
#ifndef DRACO_OLD_GCC
return file; return file;
#else
return std::move(file);
#endif
} }
bool StdioFileReader::ReadFileToBuffer(std::vector<char> *buffer) { bool StdioFileReader::ReadFileToBuffer(std::vector<char> *buffer) {

5
src/draco/io/stdio_file_writer.cc
View File

@ -6,6 +6,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "draco/draco_features.h"
#include "draco/io/file_writer_factory.h" #include "draco/io/file_writer_factory.h"
namespace draco { namespace draco {
@ -41,7 +42,11 @@ std::unique_ptr<FileWriterInterface> StdioFileWriter::Open(
return nullptr; return nullptr;
} }
#ifndef DRACO_OLD_GCC
return file; return file;
#else
return std::move(file);
#endif
} }
bool StdioFileWriter::Write(const char *buffer, size_t size) { bool StdioFileWriter::Write(const char *buffer, size_t size) {