rename timestamp name to avoid conflicts

This commit is contained in:
Konstantin Käfer
2014-07-01 05:20:03 -07:00
parent ce44d8255d
commit 409a6ec6f4
3 changed files with 7 additions and 7 deletions

View File

@@ -11,8 +11,8 @@
namespace llmr {
struct FrameSnapshot {
explicit inline FrameSnapshot(timestamp timestamp, float z) : timestamp(timestamp), z(z) {}
float timestamp;
explicit inline FrameSnapshot(timestamp t, float z) : t(t), z(z) {}
float t;
float z;
};