#At file:///Users/mz/mysql/ndb-6.3-ndbjtie-work/ based on revid:martin.zaun@stripped
3075 Martin Zaun 2009-10-08
ndbjtie - cleanup of variable-width number type trait definitions and specializations.
modified:
storage/ndb/ndbjtie/jtie/include/jtie_tconv_array_impl.hpp
storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval.hpp
storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval_impl.hpp
storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval.hpp
storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval_impl.hpp
storage/ndb/ndbjtie/jtie/include/jtie_tconv_value.hpp
storage/ndb/ndbjtie/jtie/include/jtie_tconv_value_impl.hpp
storage/ndb/ndbjtie/jtie/include/jtie_tconv_vwidth.hpp
storage/ndb/ndbjtie/ndbjtie/src/Makefile
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_tconv_array_impl.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_tconv_array_impl.hpp 2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_tconv_array_impl.hpp 2009-10-09 04:18:35 +0000
@@ -111,7 +111,7 @@ private:
};
// ---------------------------------------------------------------------------
-// Specializations for array conversions of exact-width types
+// Specializations for array conversions of exact-width primitive type
// ---------------------------------------------------------------------------
template<> struct ArrayConv< jbooleanArray, bool * >
@@ -199,19 +199,19 @@ template<> struct ArrayConv< jdoubleArra
&JNIEnv::SetDoubleArrayRegion > {};
// ---------------------------------------------------------------------------
-// Specializations for array conversions of variable-width types
+// Specializations for array conversions of variable-width primitive type
// ---------------------------------------------------------------------------
#if (defined(JTIE_TSPECIALIZE_SHORT) && JTIE_TSPECIALIZE_SHORT > 0)
-template<> struct ArrayConv< jintArray, signed short * >
-: ArrayConvImpl< JTIE_JNI_SHORT_ARRAY_PTR_T, JTIE_JNI_SHORT_T, signed short,
+template<> struct ArrayConv< JTIE_JNI_SHORT_ARRAY_T *, signed short * >
+: ArrayConvImpl< JTIE_JNI_SHORT_ARRAY_T *, JTIE_JNI_SHORT_T, signed short,
&JNIEnv::JTIE_JNI_GET_SHORT_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_SHORT_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_SHORT_ARRAY,
&JNIEnv::JTIE_JNI_SET_SHORT_ARRAY_REGION > {};
-template<> struct ArrayConv< jintArray, unsigned short * >
-: ArrayConvImpl< JTIE_JNI_SHORT_ARRAY_PTR_T, JTIE_JNI_SHORT_T, unsigned short,
+template<> struct ArrayConv< JTIE_JNI_SHORT_ARRAY_T *, unsigned short * >
+: ArrayConvImpl< JTIE_JNI_SHORT_ARRAY_T *, JTIE_JNI_SHORT_T, unsigned short,
&JNIEnv::JTIE_JNI_GET_SHORT_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_SHORT_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_SHORT_ARRAY,
@@ -219,15 +219,15 @@ template<> struct ArrayConv< jintArray,
#endif
#if (defined(JTIE_TSPECIALIZE_INT) && JTIE_TSPECIALIZE_INT > 0)
-template<> struct ArrayConv< jintArray, signed int * >
-: ArrayConvImpl< JTIE_JNI_INT_ARRAY_PTR_T, JTIE_JNI_INT_T, signed int,
+template<> struct ArrayConv< JTIE_JNI_INT_ARRAY_T *, signed int * >
+: ArrayConvImpl< JTIE_JNI_INT_ARRAY_T *, JTIE_JNI_INT_T, signed int,
&JNIEnv::JTIE_JNI_GET_INT_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_INT_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_INT_ARRAY,
&JNIEnv::JTIE_JNI_SET_INT_ARRAY_REGION > {};
-template<> struct ArrayConv< jintArray, unsigned long * >
-: ArrayConvImpl< JTIE_JNI_LONG_ARRAY_PTR_T, JTIE_JNI_LONG_T, unsigned long,
+template<> struct ArrayConv< JTIE_JNI_LONG_ARRAY_T *, unsigned long * >
+: ArrayConvImpl< JTIE_JNI_LONG_ARRAY_T *, JTIE_JNI_LONG_T, unsigned long,
&JNIEnv::JTIE_JNI_GET_LONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_LONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_LONG_ARRAY,
@@ -235,15 +235,15 @@ template<> struct ArrayConv< jintArray,
#endif
#if (defined(JTIE_TSPECIALIZE_LONG) && JTIE_TSPECIALIZE_LONG > 0)
-template<> struct ArrayConv< jintArray, signed long * >
-: ArrayConvImpl< JTIE_JNI_LONG_ARRAY_PTR_T, JTIE_JNI_LONG_T, signed long,
+template<> struct ArrayConv< JTIE_JNI_LONG_ARRAY_T *, signed long * >
+: ArrayConvImpl< JTIE_JNI_LONG_ARRAY_T *, JTIE_JNI_LONG_T, signed long,
&JNIEnv::JTIE_JNI_GET_LONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_LONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_LONG_ARRAY,
&JNIEnv::JTIE_JNI_SET_LONG_ARRAY_REGION > {};
-template<> struct ArrayConv< jintArray, unsigned long * >
-: ArrayConvImpl< JTIE_JNI_LONG_ARRAY_PTR_T, JTIE_JNI_LONG_T, unsigned long,
+template<> struct ArrayConv< JTIE_JNI_LONG_ARRAY_T *, unsigned long * >
+: ArrayConvImpl< JTIE_JNI_LONG_ARRAY_T *, JTIE_JNI_LONG_T, unsigned long,
&JNIEnv::JTIE_JNI_GET_LONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_LONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_LONG_ARRAY,
@@ -251,15 +251,15 @@ template<> struct ArrayConv< jintArray,
#endif
#if (defined(JTIE_TSPECIALIZE_LONGLONG) && JTIE_TSPECIALIZE_LONGLONG > 0)
-template<> struct ArrayConv< jintArray, signed long long * >
-: ArrayConvImpl< JTIE_JNI_LONGLONG_ARRAY_PTR_T, JTIE_JNI_LONGLONG_T, signed long long,
+template<> struct ArrayConv< JTIE_JNI_LONGLONG_ARRAY_T *, signed long long * >
+: ArrayConvImpl< JTIE_JNI_LONGLONG_ARRAY_T *, JTIE_JNI_LONGLONG_T, signed long long,
&JNIEnv::JTIE_JNI_GET_LONGLONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_LONGLONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_LONGLONG_ARRAY,
&JNIEnv::JTIE_JNI_SET_LONGLONG_ARRAY_REGION > {};
-template<> struct ArrayConv< jintArray, unsigned long * >
-: ArrayConvImpl< JTIE_JNI_LONG_ARRAY_PTR_T, JTIE_JNI_LONG_T, unsigned long,
+template<> struct ArrayConv< JTIE_JNI_LONG_ARRAY_T *, unsigned long * >
+: ArrayConvImpl< JTIE_JNI_LONG_ARRAY_T *, JTIE_JNI_LONG_T, unsigned long,
&JNIEnv::JTIE_JNI_GET_LONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_LONG_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_LONG_ARRAY,
@@ -267,8 +267,8 @@ template<> struct ArrayConv< jintArray,
#endif
#if (defined(JTIE_TSPECIALIZE_LONGDOUBLE) && JTIE_TSPECIALIZE_LONGDOUBLE > 0)
-template<> struct ArrayConv< jintArray, long double * >
-: ArrayConvImpl< JTIE_JNI_LONGDOUBLE_ARRAY_PTR_T, JTIE_JNI_LONGDOUBLE_T, long double,
+template<> struct ArrayConv< JTIE_JNI_LONGDOUBLE_ARRAY_T *, long double * >
+: ArrayConvImpl< JTIE_JNI_LONGDOUBLE_ARRAY_T *, JTIE_JNI_LONGDOUBLE_T, long double,
&JNIEnv::JTIE_JNI_GET_LONGDOUBLE_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_RELEASE_LONGDOUBLE_ARRAY_ELEMENTS,
&JNIEnv::JTIE_JNI_NEW_LONGDOUBLE_ARRAY,
@@ -276,7 +276,7 @@ template<> struct ArrayConv< jintArray,
#endif
// ---------------------------------------------------------------------------
-// Specializations for const array conversions of exact-width types
+// Specializations for const array conversions of exact-width primitive type
// ---------------------------------------------------------------------------
// Not sure why this generalized const specialization
@@ -322,44 +322,44 @@ template<> struct ArrayConv< jdoubleArra
: ArrayConv< jdoubleArray, double * > {};
// ---------------------------------------------------------------------------
-// Specializations for const array conversions of variable-width types
+// Specializations for const array conversions of variable-width primitive type
// ---------------------------------------------------------------------------
#if (defined(JTIE_TSPECIALIZE_SHORT) && JTIE_TSPECIALIZE_SHORT > 0)
-template<> struct ArrayConv< JTIE_JNI_SHORT_ARRAY_PTR_T, const signed short * >
-: ArrayConv< JTIE_JNI_SHORT_ARRAY_PTR_T, signed short * > {};
+template<> struct ArrayConv< JTIE_JNI_SHORT_ARRAY_T *, const signed short * >
+: ArrayConv< JTIE_JNI_SHORT_ARRAY_T *, signed short * > {};
-template<> struct ArrayConv< JTIE_JNI_SHORT_ARRAY_PTR_T, const unsigned short * >
-: ArrayConv< JTIE_JNI_SHORT_ARRAY_PTR_T, unsigned short * > {};
+template<> struct ArrayConv< JTIE_JNI_SHORT_ARRAY_T *, const unsigned short * >
+: ArrayConv< JTIE_JNI_SHORT_ARRAY_T *, unsigned short * > {};
#endif
#if (defined(JTIE_TSPECIALIZE_INT) && JTIE_TSPECIALIZE_INT > 0)
-template<> struct ArrayConv< JTIE_JNI_INT_ARRAY_PTR_T, const signed int * >
-: ArrayConv< JTIE_JNI_INT_ARRAY_PTR_T, signed int * > {};
+template<> struct ArrayConv< JTIE_JNI_INT_ARRAY_T *, const signed int * >
+: ArrayConv< JTIE_JNI_INT_ARRAY_T *, signed int * > {};
-template<> struct ArrayConv< JTIE_JNI_INT_ARRAY_PTR_T, const unsigned int * >
-: ArrayConv< JTIE_JNI_INT_ARRAY_PTR_T, unsigned int * > {};
+template<> struct ArrayConv< JTIE_JNI_INT_ARRAY_T *, const unsigned int * >
+: ArrayConv< JTIE_JNI_INT_ARRAY_T *, unsigned int * > {};
#endif
#if (defined(JTIE_TSPECIALIZE_LONG) && JTIE_TSPECIALIZE_LONG > 0)
-template<> struct ArrayConv< JTIE_JNI_LONG_ARRAY_PTR_T, const signed long * >
-: ArrayConv< JTIE_JNI_LONG_ARRAY_PTR_T, signed long * > {};
+template<> struct ArrayConv< JTIE_JNI_LONG_ARRAY_T *, const signed long * >
+: ArrayConv< JTIE_JNI_LONG_ARRAY_T *, signed long * > {};
-template<> struct ArrayConv< JTIE_JNI_LONG_ARRAY_PTR_T, const unsigned long * >
-: ArrayConv< JTIE_JNI_LONG_ARRAY_PTR_T, unsigned long * > {};
+template<> struct ArrayConv< JTIE_JNI_LONG_ARRAY_T *, const unsigned long * >
+: ArrayConv< JTIE_JNI_LONG_ARRAY_T *, unsigned long * > {};
#endif
#if (defined(JTIE_TSPECIALIZE_LONGLONG) && JTIE_TSPECIALIZE_LONGLONG > 0)
-template<> struct ArrayConv< JTIE_JNI_LONGLONG_ARRAY_PTR_T, const signed long long * >
-: ArrayConv< JTIE_JNI_LONGLONG_ARRAY_PTR_T, signed long long * > {};
+template<> struct ArrayConv< JTIE_JNI_LONGLONG_ARRAY_T *, const signed long long * >
+: ArrayConv< JTIE_JNI_LONGLONG_ARRAY_T *, signed long long * > {};
-template<> struct ArrayConv< JTIE_JNI_LONGLONG_ARRAY_PTR_T, const unsigned long long * >
-: ArrayConv< JTIE_JNI_LONGLONG_ARRAY_PTR_T, unsigned long long * > {};
+template<> struct ArrayConv< JTIE_JNI_LONGLONG_ARRAY_T *, const unsigned long long * >
+: ArrayConv< JTIE_JNI_LONGLONG_ARRAY_T *, unsigned long long * > {};
#endif
#if (defined(JTIE_TSPECIALIZE_LONGDOUBLE) && JTIE_TSPECIALIZE_LONGDOUBLE > 0)
-template<> struct ArrayConv< JTIE_JNI_LONGDOUBLE_ARRAY_PTR_T, const long double * >
-: ArrayConv< JTIE_JNI_LONGDOUBLE_ARRAY_PTR_T, long double * > {};
+template<> struct ArrayConv< JTIE_JNI_LONGDOUBLE_ARRAY_T *, const long double * >
+: ArrayConv< JTIE_JNI_LONGDOUBLE_ARRAY_T *, long double * > {};
#endif
// ---------------------------------------------------------------------------
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval.hpp 2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval.hpp 2009-10-09 04:18:35 +0000
@@ -57,6 +57,26 @@ typedef ttrait< jlongArray, uint64_t * >
typedef ttrait< jfloatArray, float * > ttrait_float_0p_a;
typedef ttrait< jdoubleArray, double * > ttrait_double_0p_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, signed short * > ttrait_short_0p_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, unsigned short * > ttrait_ushort_0p_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, signed int * > ttrait_int_0p_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, unsigned int * > ttrait_uint_0p_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, signed long * > ttrait_long_0p_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, unsigned long * > ttrait_ulong_0p_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, signed long long * > ttrait_longlong_0p_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, unsigned long long * > ttrait_ulonglong_0p_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, long double * > ttrait_longdouble_0p_a;
+#endif
+
// aliases for: <const-primitive-ctype>_<pointer>_<Array<size=0>>
typedef ttrait< jbooleanArray, const bool * > ttrait_bool_0cp_a;
typedef ttrait< jbyteArray, const char * > ttrait_char_0cp_a;
@@ -71,6 +91,26 @@ typedef ttrait< jlongArray, const uint64
typedef ttrait< jfloatArray, const float * > ttrait_float_0cp_a;
typedef ttrait< jdoubleArray, const double * > ttrait_double_0cp_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, const signed short * > ttrait_short_0cp_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, const unsigned short * > ttrait_ushort_0cp_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, const signed int * > ttrait_int_0cp_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, const unsigned int * > ttrait_uint_0cp_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, const signed long * > ttrait_long_0cp_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, const unsigned long * > ttrait_ulong_0cp_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, const signed long long * > ttrait_longlong_0cp_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, const unsigned long long * > ttrait_ulonglong_0cp_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, const long double * > ttrait_longdouble_0cp_a;
+#endif
+
// aliases for: <primitive-ctype>_<pointer>_<Array<size=0>>
typedef ttrait< jbooleanArray, bool * const > ttrait_bool_0pc_a;
typedef ttrait< jbyteArray, char * const > ttrait_char_0pc_a;
@@ -85,6 +125,26 @@ typedef ttrait< jlongArray, uint64_t * c
typedef ttrait< jfloatArray, float * const > ttrait_float_0pc_a;
typedef ttrait< jdoubleArray, double * const > ttrait_double_0pc_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, signed short * const > ttrait_short_0pc_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, unsigned short * const > ttrait_ushort_0pc_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, signed int * const > ttrait_int_0pc_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, unsigned int * const > ttrait_uint_0pc_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, signed long * const > ttrait_long_0pc_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, unsigned long * const > ttrait_ulong_0pc_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, signed long long * const > ttrait_longlong_0pc_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, unsigned long long * const > ttrait_ulonglong_0pc_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, long double * const > ttrait_longdouble_0pc_a;
+#endif
+
// aliases for: <const-primitive-ctype>_<pointer>_<Array<size=0>>
typedef ttrait< jbooleanArray, const bool * const > ttrait_bool_0cpc_a;
typedef ttrait< jbyteArray, const char * const > ttrait_char_0cpc_a;
@@ -99,6 +159,26 @@ typedef ttrait< jlongArray, const uint64
typedef ttrait< jfloatArray, const float * const > ttrait_float_0cpc_a;
typedef ttrait< jdoubleArray, const double * const > ttrait_double_0cpc_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, const signed short * const > ttrait_short_0cpc_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, const unsigned short * const > ttrait_ushort_0cpc_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, const signed int * const > ttrait_int_0cpc_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, const unsigned int * const > ttrait_uint_0cpc_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, const signed long * const > ttrait_long_0cpc_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, const unsigned long * const > ttrait_ulong_0cpc_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, const signed long long * const > ttrait_longlong_0cpc_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, const unsigned long long * const > ttrait_ulonglong_0cpc_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, const long double * const > ttrait_longdouble_0cpc_a;
+#endif
+
// aliases for: <primitive-ctype>_<pointer>_<Array<size=1>>
typedef ttrait< jbooleanArray, bool *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< _jbooleanArray, 1 > > * > ttrait_bool_1p_a;
typedef ttrait< jbyteArray, char *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< _jbyteArray, 1 > > * > ttrait_char_1p_a;
@@ -113,6 +193,26 @@ typedef ttrait< jlongArray, uint64_t *,
typedef ttrait< jfloatArray, float *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< _jfloatArray, 1 > > * > ttrait_float_1p_a;
typedef ttrait< jdoubleArray, double *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< _jdoubleArray, 1 > > * > ttrait_double_1p_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, signed short *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_SHORT_ARRAY_T, 1 > > * > ttrait_short_1p_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, unsigned short *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_SHORT_ARRAY_T, 1 > > * > ttrait_ushort_1p_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, signed int *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_INT_ARRAY_T, 1 > > * > ttrait_int_1p_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, unsigned int *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_INT_ARRAY_T, 1 > > * > ttrait_uint_1p_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, signed long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONG_ARRAY_T, 1 > > * > ttrait_long_1p_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, unsigned long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONG_ARRAY_T, 1 > > * > ttrait_ulong_1p_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, signed long long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGLONG_ARRAY_T, 1 > > * > ttrait_longlong_1p_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, unsigned long long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGLONG_ARRAY_T, 1 > > * > ttrait_ulonglong_1p_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, long double *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGDOUBLE_ARRAY_T, 1 > > * > ttrait_longdouble_1p_a;
+#endif
+
// aliases for: <const-primitive-ctype>_<pointer>_<Array<size=1>>
typedef ttrait< jbooleanArray, const bool *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< _jbooleanArray, 1 > > * > ttrait_bool_1cp_a;
typedef ttrait< jbyteArray, const char *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< _jbyteArray, 1 > > * > ttrait_char_1cp_a;
@@ -127,6 +227,26 @@ typedef ttrait< jlongArray, const uint64
typedef ttrait< jfloatArray, const float *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< _jfloatArray, 1 > > * > ttrait_float_1cp_a;
typedef ttrait< jdoubleArray, const double *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< _jdoubleArray, 1 > > * > ttrait_double_1cp_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, const signed short *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_SHORT_ARRAY_T, 1 > > * > ttrait_short_1cp_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, const unsigned short *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_SHORT_ARRAY_T, 1 > > * > ttrait_ushort_1cp_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, const signed int *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_INT_ARRAY_T, 1 > > * > ttrait_int_1cp_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, const unsigned int *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_INT_ARRAY_T, 1 > > * > ttrait_uint_1cp_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, const signed long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONG_ARRAY_T, 1 > > * > ttrait_long_1cp_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, const unsigned long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONG_ARRAY_T, 1 > > * > ttrait_ulong_1cp_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, const signed long long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGLONG_ARRAY_T, 1 > > * > ttrait_longlong_1cp_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, const unsigned long long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGLONG_ARRAY_T, 1 > > * > ttrait_ulonglong_1cp_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, const long double *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGDOUBLE_ARRAY_T, 1 > > * > ttrait_longdouble_1cp_a;
+#endif
+
// aliases for: <primitive-ctype>_<const-pointer>_<Array<size=1>>
typedef ttrait< jbooleanArray, bool * const, _jtie_j_ArrayMapper< _jtie_j_BoundedArray<_jbooleanArray, 1 > > * > ttrait_bool_1pc_a;
typedef ttrait< jbyteArray, char * const, _jtie_j_ArrayMapper< _jtie_j_BoundedArray<_jbyteArray, 1 > > * > ttrait_char_1pc_a;
@@ -141,6 +261,26 @@ typedef ttrait< jlongArray, uint64_t * c
typedef ttrait< jfloatArray, float * const, _jtie_j_ArrayMapper< _jtie_j_BoundedArray<_jfloatArray, 1 > > * > ttrait_float_1pc_a;
typedef ttrait< jdoubleArray, double * const, _jtie_j_ArrayMapper< _jtie_j_BoundedArray<_jdoubleArray, 1 > > * > ttrait_double_1pc_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, signed short *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_SHORT_ARRAY_T, 1 > > * const > ttrait_short_1pc_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, unsigned short *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_SHORT_ARRAY_T, 1 > > * const > ttrait_ushort_1pc_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, signed int *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_INT_ARRAY_T, 1 > > * const > ttrait_int_1pc_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, unsigned int *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_INT_ARRAY_T, 1 > > * const > ttrait_uint_1pc_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, signed long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONG_ARRAY_T, 1 > > * const > ttrait_long_1pc_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, unsigned long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONG_ARRAY_T, 1 > > * const > ttrait_ulong_1pc_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, signed long long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGLONG_ARRAY_T, 1 > > * const > ttrait_longlong_1pc_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, unsigned long long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGLONG_ARRAY_T, 1 > > * const > ttrait_ulonglong_1pc_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, long double *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGDOUBLE_ARRAY_T, 1 > > * const > ttrait_longdouble_1pc_a;
+#endif
+
// aliases for: <const-primitive-ctype>_<const-pointer>_<Array<size=1>>
typedef ttrait< jbooleanArray, const bool * const, _jtie_j_ArrayMapper< _jtie_j_BoundedArray<_jbooleanArray, 1 > > * > ttrait_bool_1cpc_a;
typedef ttrait< jbyteArray, const char * const, _jtie_j_ArrayMapper< _jtie_j_BoundedArray<_jbyteArray, 1 > > * > ttrait_char_1cpc_a;
@@ -155,6 +295,26 @@ typedef ttrait< jlongArray, const uint64
typedef ttrait< jfloatArray, const float * const, _jtie_j_ArrayMapper< _jtie_j_BoundedArray<_jfloatArray, 1 > > * > ttrait_float_1cpc_a;
typedef ttrait< jdoubleArray, const double * const, _jtie_j_ArrayMapper< _jtie_j_BoundedArray<_jdoubleArray, 1 > > * > ttrait_double_1cpc_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, const signed short *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_SHORT_ARRAY_T, 1 > > * const > ttrait_short_1cpc_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, const unsigned short *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_SHORT_ARRAY_T, 1 > > * const > ttrait_ushort_1cpc_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, const signed int *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_INT_ARRAY_T, 1 > > * const > ttrait_int_1cpc_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, const unsigned int *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_INT_ARRAY_T, 1 > > * const > ttrait_uint_1cpc_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, const signed long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONG_ARRAY_T, 1 > > * const > ttrait_long_1cpc_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, const unsigned long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONG_ARRAY_T, 1 > > * const > ttrait_ulong_1cpc_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, const signed long long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGLONG_ARRAY_T, 1 > > * const > ttrait_longlong_1cpc_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, const unsigned long long *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGLONG_ARRAY_T, 1 > > * const > ttrait_ulonglong_1cpc_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, const long double *, _jtie_j_ArrayMapper< _jtie_j_BoundedArray< JTIE_JNI_LONGDOUBLE_ARRAY_T, 1 > > * const > ttrait_longdouble_1cpc_a;
+#endif
+
// ---------------------------------------------------------------------------
#endif // jtie_tconv_ptrbyval_hpp
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval_impl.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval_impl.hpp 2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval_impl.hpp 2009-10-09 04:18:35 +0000
@@ -177,7 +177,7 @@ struct Result< _jtie_j_ArrayMapper< J >
: ArrayPtrResult< _jtie_j_ArrayMapper< J >, C > {};
// ---------------------------------------------------------------------------
-// Specializations for exact-width pointer type conversions
+// Specializations for pointer to exact-width primitive type conversions
// ---------------------------------------------------------------------------
// non-const pointer parameters
@@ -237,7 +237,7 @@ template<> struct Result< _jfloatArray *
template<> struct Result< _jdoubleArray *, const double * > : ArrayPtrResult< _jtie_j_BoundedArray< _jdoubleArray, 0 >, const double > {};
// ---------------------------------------------------------------------------
-// Specializations for variable-width pointer type conversions
+// Specializations for pointer to variable-width primitive type conversions
// ---------------------------------------------------------------------------
// non-const pointer parameters
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval.hpp 2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval.hpp 2009-10-09 04:18:35 +0000
@@ -45,15 +45,25 @@ typedef ttrait< jlong, uint64_t & > ttra
typedef ttrait< jfloat, float & > ttrait_float_r_v;
typedef ttrait< jdouble, double & > ttrait_double_r_v;
+#ifdef JTIE_JNI_SHORT_T
typedef ttrait< JTIE_JNI_SHORT_T, signed short & > ttrait_short_r_v;
typedef ttrait< JTIE_JNI_SHORT_T, unsigned short & > ttrait_ushort_r_v;
+#endif
+#ifdef JTIE_JNI_INT_T
typedef ttrait< JTIE_JNI_INT_T, signed int & > ttrait_int_r_v;
typedef ttrait< JTIE_JNI_INT_T, unsigned int & > ttrait_uint_r_v;
+#endif
+#ifdef JTIE_JNI_LONG_T
typedef ttrait< JTIE_JNI_LONG_T, signed long & > ttrait_long_r_v;
typedef ttrait< JTIE_JNI_LONG_T, unsigned long & > ttrait_ulong_r_v;
+#endif
+#ifdef JTIE_JNI_LONGLONG_T
typedef ttrait< JTIE_JNI_LONGLONG_T, signed long long & > ttrait_longlong_r_v;
typedef ttrait< JTIE_JNI_LONGLONG_T, unsigned long long & > ttrait_ulonglong_r_v;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_T
typedef ttrait< JTIE_JNI_LONGDOUBLE_T, long double & > ttrait_longdouble_r_v;
+#endif
// aliases for: <primitive-ctype>_<const-reference>_<value>
typedef ttrait< jboolean, const bool & > ttrait_bool_cr_v;
@@ -69,15 +79,25 @@ typedef ttrait< jlong, const uint64_t &
typedef ttrait< jfloat, const float & > ttrait_float_cr_v;
typedef ttrait< jdouble, const double & > ttrait_double_cr_v;
+#ifdef JTIE_JNI_SHORT_T
typedef ttrait< JTIE_JNI_SHORT_T, const signed short & > ttrait_short_cr_v;
typedef ttrait< JTIE_JNI_SHORT_T, const unsigned short & > ttrait_ushort_cr_v;
+#endif
+#ifdef JTIE_JNI_INT_T
typedef ttrait< JTIE_JNI_INT_T, const signed int & > ttrait_int_cr_v;
typedef ttrait< JTIE_JNI_INT_T, const unsigned int & > ttrait_uint_cr_v;
+#endif
+#ifdef JTIE_JNI_LONG_T
typedef ttrait< JTIE_JNI_LONG_T, const signed long & > ttrait_long_cr_v;
typedef ttrait< JTIE_JNI_LONG_T, const unsigned long & > ttrait_ulong_cr_v;
+#endif
+#ifdef JTIE_JNI_LONGLONG_T
typedef ttrait< JTIE_JNI_LONGLONG_T, const signed long long & > ttrait_longlong_cr_v;
typedef ttrait< JTIE_JNI_LONGLONG_T, const unsigned long long & > ttrait_ulonglong_cr_v;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_T
typedef ttrait< JTIE_JNI_LONGDOUBLE_T, const long double & > ttrait_longdouble_cr_v;
+#endif
// aliases for: <primitive-ctype>_<reference>_<array<size=1>>
typedef ttrait< jbooleanArray, bool & > ttrait_bool_r_a;
@@ -93,15 +113,25 @@ typedef ttrait< jlongArray, uint64_t & >
typedef ttrait< jfloatArray, float & > ttrait_float_r_a;
typedef ttrait< jdoubleArray, double & > ttrait_double_r_a;
-typedef ttrait< JTIE_JNI_SHORT_ARRAY_PTR_T, signed short & > ttrait_short_r_a;
-typedef ttrait< JTIE_JNI_SHORT_ARRAY_PTR_T, unsigned short & > ttrait_ushort_r_a;
-typedef ttrait< JTIE_JNI_INT_ARRAY_PTR_T, signed int & > ttrait_int_r_a;
-typedef ttrait< JTIE_JNI_INT_ARRAY_PTR_T, unsigned int & > ttrait_uint_r_a;
-typedef ttrait< JTIE_JNI_LONG_ARRAY_PTR_T, signed long & > ttrait_long_r_a;
-typedef ttrait< JTIE_JNI_LONG_ARRAY_PTR_T, unsigned long & > ttrait_ulong_r_a;
-typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_PTR_T, signed long long & > ttrait_longlong_r_a;
-typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_PTR_T, unsigned long long & > ttrait_ulonglong_r_a;
-typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_PTR_T, long double & > ttrait_longdouble_r_a;
+#ifdef JTIE_JNI_SHORT_ARRAY_T
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, signed short & > ttrait_short_r_a;
+typedef ttrait< JTIE_JNI_SHORT_ARRAY_T *, unsigned short & > ttrait_ushort_r_a;
+#endif
+#ifdef JTIE_JNI_INT_ARRAY_T
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, signed int & > ttrait_int_r_a;
+typedef ttrait< JTIE_JNI_INT_ARRAY_T *, unsigned int & > ttrait_uint_r_a;
+#endif
+#ifdef JTIE_JNI_LONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, signed long & > ttrait_long_r_a;
+typedef ttrait< JTIE_JNI_LONG_ARRAY_T *, unsigned long & > ttrait_ulong_r_a;
+#endif
+#ifdef JTIE_JNI_LONGLONG_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, signed long long & > ttrait_longlong_r_a;
+typedef ttrait< JTIE_JNI_LONGLONG_ARRAY_T *, unsigned long long & > ttrait_ulonglong_r_a;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_ARRAY_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_ARRAY_T *, long double & > ttrait_longdouble_r_a;
+#endif
// ---------------------------------------------------------------------------
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval_impl.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval_impl.hpp 2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval_impl.hpp 2009-10-09 04:18:35 +0000
@@ -114,7 +114,7 @@ struct ArrayRefResult {
// we enumerate all specicializations for primitive type references.
// ---------------------------------------------------------------------------
-// Specializations for exact-width reference type conversions
+// Specializations for reference to exact-width primitive type conversions
// ---------------------------------------------------------------------------
// const reference parameters (map as value copy)
@@ -174,7 +174,7 @@ template<> struct Result< jfloat, float
template<> struct Result< jdouble, double & > : Result< jdouble, double > {};
// ---------------------------------------------------------------------------
-// Specializations for variable-width reference type conversions
+// Specializations for reference to variable-width primitive type conversions
// ---------------------------------------------------------------------------
// const reference parameters (map as value copy)
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_tconv_value.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_tconv_value.hpp 2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_tconv_value.hpp 2009-10-09 04:18:35 +0000
@@ -28,7 +28,7 @@
#include "jtie_tconv_vwidth.hpp"
// ---------------------------------------------------------------------------
-// Java <-> C exact-width primitive type conversions
+// Java <-> C primitive type conversions
// ---------------------------------------------------------------------------
// aliases for: <primitive-ctype>
@@ -47,6 +47,26 @@ typedef ttrait< jlong, uint64_t > ttrait
typedef ttrait< jfloat, float > ttrait_float;
typedef ttrait< jdouble, double > ttrait_double;
+#ifdef JTIE_JNI_SHORT_T
+typedef ttrait< JTIE_JNI_SHORT_T, signed short > ttrait_short;
+typedef ttrait< JTIE_JNI_SHORT_T, unsigned short > ttrait_ushort;
+#endif
+#ifdef JTIE_JNI_INT_T
+typedef ttrait< JTIE_JNI_INT_T, signed int > ttrait_int;
+typedef ttrait< JTIE_JNI_INT_T, unsigned int > ttrait_uint;
+#endif
+#ifdef JTIE_JNI_LONG_T
+typedef ttrait< JTIE_JNI_LONG_T, signed long > ttrait_long;
+typedef ttrait< JTIE_JNI_LONG_T, unsigned long > ttrait_ulong;
+#endif
+#ifdef JTIE_JNI_LONGLONG_T
+typedef ttrait< JTIE_JNI_LONGLONG_T, signed long long > ttrait_longlong;
+typedef ttrait< JTIE_JNI_LONGLONG_T, unsigned long long > ttrait_ulonglong;
+#endif
+#ifdef JTIE_JNI_LONGDOUBLE_T
+typedef ttrait< JTIE_JNI_LONGDOUBLE_T, long double > ttrait_longdouble;
+#endif
+
// aliases for: <const-primitive-ctype>
typedef ttrait< jboolean, const bool > ttrait_bool_c;
typedef ttrait< jbyte, const char > ttrait_char_c;
@@ -63,52 +83,33 @@ typedef ttrait< jlong, const uint64_t >
typedef ttrait< jfloat, const float > ttrait_float_c;
typedef ttrait< jdouble, const double > ttrait_double_c;
-/**
- * A helper class template that predicates the supported type conversions
- * by presence of specialization.
- */
-template < typename J, typename C >
-struct is_valid_primitive_type_mapping;
-
-// ---------------------------------------------------------------------------
-// variable-width number type conversions
-// ---------------------------------------------------------------------------
-
-// convenience type aliases for: <[const-]primitive-ctype>
-
#ifdef JTIE_JNI_SHORT_T
-typedef ttrait< JTIE_JNI_SHORT_T, signed short > ttrait_short;
-typedef ttrait< JTIE_JNI_SHORT_T, unsigned short > ttrait_ushort;
typedef ttrait< JTIE_JNI_SHORT_T, const signed short > ttrait_short_c;
typedef ttrait< JTIE_JNI_SHORT_T, const unsigned short > ttrait_ushort_c;
#endif
-
#ifdef JTIE_JNI_INT_T
-typedef ttrait< JTIE_JNI_INT_T, signed int > ttrait_int;
-typedef ttrait< JTIE_JNI_INT_T, unsigned int > ttrait_uint;
typedef ttrait< JTIE_JNI_INT_T, const signed int > ttrait_int_c;
typedef ttrait< JTIE_JNI_INT_T, const unsigned int > ttrait_uint_c;
#endif
-
#ifdef JTIE_JNI_LONG_T
-typedef ttrait< JTIE_JNI_LONG_T, signed long > ttrait_long;
-typedef ttrait< JTIE_JNI_LONG_T, unsigned long > ttrait_ulong;
typedef ttrait< JTIE_JNI_LONG_T, const signed long > ttrait_long_c;
typedef ttrait< JTIE_JNI_LONG_T, const unsigned long > ttrait_ulong_c;
#endif
-
#ifdef JTIE_JNI_LONGLONG_T
-typedef ttrait< JTIE_JNI_LONGLONG_T, signed long long > ttrait_longlong;
-typedef ttrait< JTIE_JNI_LONGLONG_T, unsigned long long > ttrait_ulonglong;
typedef ttrait< JTIE_JNI_LONGLONG_T, const signed long long > ttrait_longlong_c;
typedef ttrait< JTIE_JNI_LONGLONG_T, const unsigned long long > ttrait_ulonglong_c;
#endif
-
#ifdef JTIE_JNI_LONGDOUBLE_T
-typedef ttrait< JTIE_JNI_LONGDOUBLE_T, long double > ttrait_longdouble;
typedef ttrait< JTIE_JNI_LONGDOUBLE_T, const long double > ttrait_longdouble_c;
#endif
+/**
+ * A helper class template that predicates the supported type conversions
+ * by presence of specialization.
+ */
+template < typename J, typename C >
+struct is_valid_primitive_type_mapping;
+
// ---------------------------------------------------------------------------
#endif // jtie_tconv_value_hpp
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_tconv_value_impl.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_tconv_value_impl.hpp 2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_tconv_value_impl.hpp 2009-10-09 04:18:35 +0000
@@ -34,28 +34,6 @@
// Java value <-> C value conversions
// ---------------------------------------------------------------------------
-// define set of valid primitive type mappings
-template <> struct is_valid_primitive_type_mapping< jboolean, bool > {};
-template <> struct is_valid_primitive_type_mapping< jbyte, char > {};
-template <> struct is_valid_primitive_type_mapping< jbyte, int8_t > {};
-template <> struct is_valid_primitive_type_mapping< jbyte, uint8_t > {};
-template <> struct is_valid_primitive_type_mapping< jshort, int16_t > {};
-template <> struct is_valid_primitive_type_mapping< jshort, uint16_t > {};
-template <> struct is_valid_primitive_type_mapping< jint, int32_t > {};
-template <> struct is_valid_primitive_type_mapping< jint, uint32_t > {};
-template <> struct is_valid_primitive_type_mapping< jlong, int64_t > {};
-template <> struct is_valid_primitive_type_mapping< jlong, uint64_t > {};
-template <> struct is_valid_primitive_type_mapping< jfloat, float > {};
-template <> struct is_valid_primitive_type_mapping< jdouble, double > {};
-
-// extend for const value specializations
-template < typename J, typename C >
-struct is_valid_primitive_type_mapping< const J, C > {};
-template < typename J, typename C >
-struct is_valid_primitive_type_mapping< J, const C > {};
-template < typename J, typename C >
-struct is_valid_primitive_type_mapping< const J, const C > {};
-
// Implements primitive type parameter conversions.
template< typename J, typename C >
struct ParamBasicT {
@@ -96,10 +74,21 @@ private:
}
};
+// extend set of valid primitive type mappings for const value specializations
+template < typename J, typename C >
+struct is_valid_primitive_type_mapping< const J, C > {};
+template < typename J, typename C >
+struct is_valid_primitive_type_mapping< J, const C > {};
+template < typename J, typename C >
+struct is_valid_primitive_type_mapping< const J, const C > {};
+
// ---------------------------------------------------------------------------
// Specializations for jboolean <-> bool conversions
// ---------------------------------------------------------------------------
+// define valid primitive type mapping for boolean
+template <> struct is_valid_primitive_type_mapping< jboolean, bool > {};
+
// Implements boolean type parameter conversions.
template<>
struct Param< jboolean, bool > {
@@ -140,6 +129,19 @@ template<> struct ResultBasicT< jboolean
// template instantiation ambiguities for non-primitive types. Therefore,
// we enumerate all specicializations for primitive types.
+// define set of valid primitive type mappings
+template <> struct is_valid_primitive_type_mapping< jbyte, char > {};
+template <> struct is_valid_primitive_type_mapping< jbyte, int8_t > {};
+template <> struct is_valid_primitive_type_mapping< jbyte, uint8_t > {};
+template <> struct is_valid_primitive_type_mapping< jshort, int16_t > {};
+template <> struct is_valid_primitive_type_mapping< jshort, uint16_t > {};
+template <> struct is_valid_primitive_type_mapping< jint, int32_t > {};
+template <> struct is_valid_primitive_type_mapping< jint, uint32_t > {};
+template <> struct is_valid_primitive_type_mapping< jlong, int64_t > {};
+template <> struct is_valid_primitive_type_mapping< jlong, uint64_t > {};
+template <> struct is_valid_primitive_type_mapping< jfloat, float > {};
+template <> struct is_valid_primitive_type_mapping< jdouble, double > {};
+
// non-const primitive parameter types
template<> struct Param< jbyte, char > : ParamBasicT< jbyte, char > {};
template<> struct Param< jbyte, int8_t > : ParamBasicT< jbyte, int8_t > {};
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_tconv_vwidth.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_tconv_vwidth.hpp 2009-09-18 20:40:07 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_tconv_vwidth.hpp 2009-10-09 04:18:35 +0000
@@ -36,7 +36,7 @@
#define JTIE_JNI_INT_T jint
#define JTIE_JNI_LONG_T jint
#define JTIE_JNI_LONGLONG_T jlong
-#define JTIE_JNI_LONGDOUBLE_T double
+#define JTIE_JNI_LONGDOUBLE_T jdouble
#define JTIE_JNI_SHORT_ARRAY_T _jshortArray
#define JTIE_JNI_INT_ARRAY_T _jintArray
@@ -44,12 +44,6 @@
#define JTIE_JNI_LONGLONG_ARRAY_T _jlongArray
#define JTIE_JNI_LONGDOUBLE_ARRAY_T _jdoubleArray
-#define JTIE_JNI_SHORT_ARRAY_PTR_T JTIE_JNI_SHORT_ARRAY_T *
-#define JTIE_JNI_INT_ARRAY_PTR_T JTIE_JNI_INT_ARRAY_T *
-#define JTIE_JNI_LONG_ARRAY_PTR_T JTIE_JNI_LONG_ARRAY_T *
-#define JTIE_JNI_LONGLONG_ARRAY_PTR_T JTIE_JNI_LONGLONG_ARRAY_T *
-#define JTIE_JNI_LONGDOUBLE_ARRAY_PTR_T JTIE_JNI_LONGDOUBLE_ARRAY_T *
-
#define JTIE_TSPECIALIZE_SHORT 0
#define JTIE_TSPECIALIZE_INT 0
#define JTIE_TSPECIALIZE_LONG 1
=== modified file 'storage/ndb/ndbjtie/ndbjtie/src/Makefile'
--- a/storage/ndb/ndbjtie/ndbjtie/src/Makefile 2009-10-06 21:29:42 +0000
+++ b/storage/ndb/ndbjtie/ndbjtie/src/Makefile 2009-10-09 04:18:35 +0000
@@ -73,7 +73,6 @@ all: $(DELIVERABLES)
dep depend: $(GENERATED_H)
-
com_mysql_ndbjtie_mgmapi_MGMAPI.h: \
$(API_PKG_PATH0)/MGMAPI.class
$(COMPILE.javah) com.mysql.ndbjtie.mgmapi.MGMAPI
Attachment: [text/bzr-bundle] bzr/martin.zaun@sun.com-20091009041835-aikc4r5zrk3gfzht.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-6.3-ndbjtie branch (martin.zaun:3075) | Martin Zaun | 9 Oct |
