From 42981e814b60007732c05129f1f7a32dda85c7bf Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 9 Aug 2018 22:20:08 +0800 Subject: *update --- build/.vs/libjin/v14/.suo | Bin 140288 -> 182272 bytes libjin/Thread/Thread.h | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/.vs/libjin/v14/.suo b/build/.vs/libjin/v14/.suo index 8f1ca05..b85a41a 100644 Binary files a/build/.vs/libjin/v14/.suo and b/build/.vs/libjin/v14/.suo differ diff --git a/libjin/Thread/Thread.h b/libjin/Thread/Thread.h index 37c978d..0777656 100644 --- a/libjin/Thread/Thread.h +++ b/libjin/Thread/Thread.h @@ -46,7 +46,7 @@ namespace thread { enum Type { - NONE = 0, + INVALID = 0, INTERGER, BOOLEAN, CHARACTER, @@ -64,7 +64,7 @@ namespace thread void* pointer; float real; }; - Variant() :type(NONE) {}; + Variant() :type(INVALID) {}; Variant(const Variant& v){ memcpy(this, &v, sizeof(v)); } Variant(int i) : integer(i), type(INTERGER) {}; Variant(float f) : real(f), type(REAL) {}; -- cgit v1.1-26-g67d0