diff options
author | chai <chaifix@163.com> | 2018-08-09 22:20:08 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-08-09 22:20:08 +0800 |
commit | 42981e814b60007732c05129f1f7a32dda85c7bf (patch) | |
tree | 0468ce3cd943ab5c658df69877023022ed5c2807 | |
parent | 3fb2df7ff0b77c7a0075473d8e4db3450191ae6b (diff) |
-rw-r--r-- | build/.vs/libjin/v14/.suo | bin | 140288 -> 182272 bytes | |||
-rw-r--r-- | 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 Binary files differindex 8f1ca05..b85a41a 100644 --- a/build/.vs/libjin/v14/.suo +++ b/build/.vs/libjin/v14/.suo 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) {}; |