benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce TINYOBJ_USE_CXX11 to suppress clang 5.0's -Wzero-as-null-pointer-constatnt warninig.

Browse Source
This commit is contained in:
Syoyo Fujita
2017-12-24 18:40:49 +09:00
parent b29d34f2e1
commit 49726abcf1
2 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
loader_example.cc
View File

@@ -29,6 +29,13 @@ extern "C" {
#endif
#endif
#ifdef TINYOBJ_USE_CXX11
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wc++98-compat"
#endif
#endif
class timerutil {
public:
#ifdef _WIN32
@@ -63,7 +70,7 @@ class timerutil {
}
time_t current() {
struct timeval t;
gettimeofday(&t, NULL);
gettimeofday(&t, tobj_null);
return static_cast<time_t>(t.tv_sec * 1000 + t.tv_usec);
}
@@ -261,7 +268,7 @@ static void PrintInfo(const tinyobj::attrib_t& attrib,
}
}
static bool TestLoadObj(const char* filename, const char* basepath = NULL,
static bool TestLoadObj(const char* filename, const char* basepath = tobj_null,
bool triangulate = true) {
std::cout << "Loading " << filename << std::endl;