summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/assimp/code/Profiler.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/assimp/code/Profiler.h')
-rw-r--r--src/3rdparty/assimp/code/Profiler.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/3rdparty/assimp/code/Profiler.h b/src/3rdparty/assimp/code/Profiler.h
index 9354339a2..1c9ca60b5 100644
--- a/src/3rdparty/assimp/code/Profiler.h
+++ b/src/3rdparty/assimp/code/Profiler.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -51,21 +52,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <map>
namespace Assimp {
- namespace Profiling {
-
- using namespace Formatter;
+namespace Profiling {
+using namespace Formatter;
// ------------------------------------------------------------------------------------------------
/** Simple wrapper around boost::timer to simplify reporting. Timings are automatically
* dumped to the log file.
*/
-class Profiler
-{
-
+class Profiler {
public:
-
- Profiler() {}
+ Profiler() {
+ // empty
+ }
public:
@@ -83,17 +82,17 @@ public:
return;
}
- auto elapsedSeconds = std::chrono::system_clock::now() - regions[region];
+ std::chrono::duration<double> elapsedSeconds = std::chrono::system_clock::now() - regions[region];
DefaultLogger::get()->debug((format("END `"),region,"`, dt= ", elapsedSeconds.count()," s"));
}
private:
-
typedef std::map<std::string,std::chrono::time_point<std::chrono::system_clock>> RegionMap;
RegionMap regions;
};
- }
+}
}
#endif
+