Reorder include and use correct datatypes

This commit is contained in:
Patrick Niklaus 2014-10-23 01:40:52 +02:00
parent 13ed186469
commit 9805b05738
2 changed files with 4 additions and 3 deletions

View File

@ -56,7 +56,7 @@ struct RectangleInt2D
const bool is_contained = Contains(location); const bool is_contained = Contains(location);
if (is_contained) if (is_contained)
{ {
return 0.; return 0.0f;
} }
enum Direction enum Direction

View File

@ -28,15 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef TIMINGUTIL_H #ifndef TIMINGUTIL_H
#define TIMINGUTIL_H #define TIMINGUTIL_H
#include <chrono>
#include <atomic> #include <atomic>
#include <chrono>
#include <cstdint>
#include <mutex> #include <mutex>
#include <unordered_map> #include <unordered_map>
struct GlobalTimer struct GlobalTimer
{ {
GlobalTimer() : time(0) {} GlobalTimer() : time(0) {}
std::atomic<long unsigned> time; std::atomic<uint64_t> time;
}; };
class GlobalTimerFactory class GlobalTimerFactory