Kouhei Sutou
null+****@clear*****
Sat May 16 18:56:01 JST 2015
Kouhei Sutou 2015-05-16 18:56:01 +0900 (Sat, 16 May 2015) New Revision: 47df32c6e5a74dc87ed0121b13db4555d3c5716e https://github.com/mroonga/mroonga/commit/47df32c6e5a74dc87ed0121b13db4555d3c5716e Message: mysql57: longlongget() requires return address Modified files: lib/mrn_multiple_column_key_codec.cpp lib/mrn_value_decoder.cpp lib/mrn_value_decoder.hpp Modified: lib/mrn_multiple_column_key_codec.cpp (+1 -1) =================================================================== --- lib/mrn_multiple_column_key_codec.cpp 2015-05-16 18:45:39 +0900 (f9b0700) +++ lib/mrn_multiple_column_key_codec.cpp 2015-05-16 18:56:01 +0900 (b4a1c3f) @@ -149,7 +149,7 @@ namespace mrn { } else #endif { - longlongget(mysql_datetime, current_mysql_key); + value_decoder::decode(&mysql_datetime, current_mysql_key); } TimeConverter time_converter; bool truncated; Modified: lib/mrn_value_decoder.cpp (+11 -0) =================================================================== --- lib/mrn_value_decoder.cpp 2015-05-16 18:45:39 +0900 (8356789) +++ lib/mrn_value_decoder.cpp 2015-05-16 18:56:01 +0900 (c01b017) @@ -60,5 +60,16 @@ namespace mrn { #endif DBUG_VOID_RETURN; } + void decode(long long int *dest, const uchar *source) { + MRN_DBUG_ENTER_FUNCTION(); +#ifdef MRN_DEST_IS_POINTER + longlongget(dest, source); +#else + long long int value; + longlongget(value, source); + *dest = value; +#endif + DBUG_VOID_RETURN; + } } } Modified: lib/mrn_value_decoder.hpp (+1 -0) =================================================================== --- lib/mrn_value_decoder.hpp 2015-05-16 18:45:39 +0900 (8a48de0) +++ lib/mrn_value_decoder.hpp 2015-05-16 18:56:01 +0900 (fe651f5) @@ -27,6 +27,7 @@ namespace mrn { void decode(uint16 *dest, const uchar *source); void decode(float *dest, const uchar *source); void decode(double *dest, const uchar *source); + void decode(long long int *dest, const uchar *source); } } -------------- next part -------------- HTML����������������������������...Download