Merge branch 'primitives' into urchin

Enable float and double.
This commit is contained in:
Avi Kivity
2015-04-11 11:08:42 +03:00
2 changed files with 5 additions and 3 deletions

View File

@@ -1310,8 +1310,10 @@ native_type returns [shared_ptr<cql3_type> t]
#if 0
| K_COUNTER { $t = CQL3Type.Native.COUNTER; }
| K_DECIMAL { $t = CQL3Type.Native.DECIMAL; }
| K_DOUBLE { $t = CQL3Type.Native.DOUBLE; }
| K_FLOAT { $t = CQL3Type.Native.FLOAT; }
#endif
| K_DOUBLE { $t = cql3_type::double_; }
| K_FLOAT { $t = cql3_type::float_; }
#if 0
| K_INET { $t = CQL3Type.Native.INET;}
#endif
| K_INT { $t = cql3_type::int_; }

View File

@@ -1483,6 +1483,6 @@ thread_local const shared_ptr<abstract_type> timeuuid_type(make_shared<timeuuid_
thread_local const shared_ptr<abstract_type> timestamp_type(make_shared<timestamp_type_impl>());
thread_local const shared_ptr<abstract_type> uuid_type(make_shared<uuid_type_impl>());
thread_local const shared_ptr<abstract_type> inet_addr_type(make_shared<inet_addr_type_impl>());
thread_local const shared_ptr<abstract_type> float_type(make_shared<double_type_impl>());
thread_local const shared_ptr<abstract_type> float_type(make_shared<float_type_impl>());
thread_local const shared_ptr<abstract_type> double_type(make_shared<double_type_impl>());
thread_local const data_type empty_type(make_shared<empty_type_impl>());