v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try fixing clang builds

pull/850/head
mensinda 2016-04-06 11:10:12 +02:00
parent 726b004806
commit f59cba13eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Profiler.h
View File

@ -83,7 +83,7 @@ public:
return; return;
} }
std::chrono::duration<double> elapsedSeconds = std::chrono::system_clock::now() - regions[region]; auto elapsedSeconds = std::chrono::system_clock::now() - regions[region];
DefaultLogger::get()->debug((format("END `"),region,"`, dt= ", elapsedSeconds.count()," s")); DefaultLogger::get()->debug((format("END `"),region,"`, dt= ", elapsedSeconds.count()," s"));
} }

6
include/assimp/defs.h
View File

@ -219,9 +219,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* without threading support. The library doesn't utilize * without threading support. The library doesn't utilize
* threads then and is itself not threadsafe. */ * threads then and is itself not threadsafe. */
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// #ifndef ASSIMP_BUILD_SINGLETHREADED #ifndef ASSIMP_BUILD_SINGLETHREADED
// # define ASSIMP_BUILD_SINGLETHREADED # define ASSIMP_BUILD_SINGLETHREADED
// #endif #endif
#if defined(_DEBUG) || ! defined(NDEBUG) #if defined(_DEBUG) || ! defined(NDEBUG)
# define ASSIMP_BUILD_DEBUG # define ASSIMP_BUILD_DEBUG