Projects >> sqlite-jna >>e772dc45c4a1b978bc6f96bdb22a63041a31f4fc

Chunk
Conflicting content 
	void(*)(void*)
	*/
	// eTextRep: SQLITE_UTF8 => 1, ...
<<<<<<< HEAD
	static native int sqlite3_create_function_v2(sqlite3 pDb,@Cast("const char*") BytePointer functionName, int nArg, int eTextRep,
																							 Pointer pApp, ScalarCallback xFunc, AggregateStepCallback xStep, AggregateFinalCallback xFinal, Destructor xDestroy);

	static native void sqlite3_result_null(sqlite3_context pCtx);
	static native void sqlite3_result_int(sqlite3_context pCtx, int i);
	static native void sqlite3_result_double(sqlite3_context pCtx, double d);
	static native void sqlite3_result_text(sqlite3_context pCtx,@Cast("const char*") BytePointer text, int n,@Cast("sqlite3_destructor_type") long xDel); // no copy needed when xDel == SQLITE_TRANSIENT == -1
	static native void sqlite3_result_blob(sqlite3_context pCtx, byte[] blob, int n,@Cast("sqlite3_destructor_type") long xDel);
	static native void sqlite3_result_int64(sqlite3_context pCtx, @Cast("sqlite3_int64") long l);
	static native void sqlite3_result_zeroblob(sqlite3_context pCtx, int n);

	static native void sqlite3_result_error(sqlite3_context pCtx,@Cast("const char*") BytePointer err, int length);
	static native void sqlite3_result_error_code(sqlite3_context pCtx, int errCode);
	static native void sqlite3_result_error_nomem(sqlite3_context pCtx);
	static native void sqlite3_result_error_toobig(sqlite3_context pCtx);
	//static native void sqlite3_result_subtype(sqlite3_context pCtx, /*unsigned*/ int subtype);

	static native @Const BytePointer sqlite3_value_blob(sqlite3_value pValue);
	static native int sqlite3_value_bytes(sqlite3_value pValue);
	static native double sqlite3_value_double(sqlite3_value pValue);
	static native int sqlite3_value_int(sqlite3_value pValue);
	static native @Cast("sqlite3_int64") long sqlite3_value_int64(sqlite3_value pValue);
	static native @Cast("const unsigned char*") BytePointer sqlite3_value_text(sqlite3_value pValue);
	static native int sqlite3_value_type(sqlite3_value pValue);
	static native int sqlite3_value_numeric_type(sqlite3_value pValue);

	static native Pointer sqlite3_get_auxdata(sqlite3_context pCtx, int n);
	static native void sqlite3_set_auxdata(sqlite3_context pCtx, int n, Pointer p, Destructor free);
	static native Pointer sqlite3_user_data(sqlite3_context pCtx);
	static native Pointer sqlite3_aggregate_context(sqlite3_context pCtx, int nBytes);
	static native sqlite3 sqlite3_context_db_handle(sqlite3_context pCtx);
=======
	static native int sqlite3_create_function_v2(SQLite3 pDb, String functionName, int nArg, int eTextRep,
			Pointer pApp, ScalarCallback xFunc, AggregateStepCallback xStep, AggregateFinalCallback xFinal, Destructor xDestroy);

	static native void sqlite3_result_null(SQLite3Context pCtx);
	static native void sqlite3_result_int(SQLite3Context pCtx, int i);
	static native void sqlite3_result_double(SQLite3Context pCtx, double d);
	static native void sqlite3_result_text(SQLite3Context pCtx, String text, int n, long xDel); // no copy needed when xDel == SQLITE_TRANSIENT == -1
	static native void sqlite3_result_blob(SQLite3Context pCtx, byte[] blob, int n, long xDel);
	static native void sqlite3_result_int64(SQLite3Context pCtx, long l);
	static native void sqlite3_result_zeroblob(SQLite3Context pCtx, int n);

	static native void sqlite3_result_error(SQLite3Context pCtx, String err, int length);
	static native void sqlite3_result_error_code(SQLite3Context pCtx, int errCode);
	static native void sqlite3_result_error_nomem(SQLite3Context pCtx);
	static native void sqlite3_result_error_toobig(SQLite3Context pCtx);
	//static native void sqlite3_result_subtype(SQLite3Context pCtx, /*unsigned*/ int subtype);

	static native Pointer sqlite3_value_blob(Pointer pValue);
	static native int sqlite3_value_bytes(Pointer pValue);
	static native double sqlite3_value_double(Pointer pValue);
	static native int sqlite3_value_int(Pointer pValue);
	static native long sqlite3_value_int64(Pointer pValue);
	static native String sqlite3_value_text(Pointer pValue);
	static native int sqlite3_value_type(Pointer pValue);
	static native int sqlite3_value_numeric_type(Pointer pValue);

	static native Pointer sqlite3_get_auxdata(SQLite3Context pCtx, int n);
	static native void sqlite3_set_auxdata(SQLite3Context pCtx, int n, Pointer p, Destructor free);
	static native Pointer sqlite3_user_data(SQLite3Context pCtx);
	static native Pointer sqlite3_aggregate_context(SQLite3Context pCtx, int nBytes);
	static native SQLite3 sqlite3_context_db_handle(SQLite3Context pCtx);
>>>>>>> 438ca2692bceae8a6efce6371cd1923cfdce9759
	public static final Charset UTF_8 = Charset.forName("UTF-8");
	public static final String UTF_8_ECONDING = UTF_8.name();
Solution content 
	void(*)(void*)
	*/
	// eTextRep: SQLITE_UTF8 => 1, ...
	static native int sqlite3_create_function_v2(sqlite3 pDb,@Cast("const char*") BytePointer functionName, int nArg, int eTextRep,
		 Pointer pApp, ScalarCallback xFunc, AggregateStepCallback xStep, AggregateFinalCallback xFinal, Destructor xDestroy);

	static native void sqlite3_result_null(sqlite3_context pCtx);
	static native void sqlite3_result_int(sqlite3_context pCtx, int i);
	static native void sqlite3_result_double(sqlite3_context pCtx, double d);
	static native void sqlite3_result_text(sqlite3_context pCtx,@Cast("const char*") BytePointer text, int n,@Cast("sqlite3_destructor_type") long xDel); // no copy needed when xDel == SQLITE_TRANSIENT == -1
	static native void sqlite3_result_blob(sqlite3_context pCtx, byte[] blob, int n,@Cast("sqlite3_destructor_type") long xDel);
	static native void sqlite3_result_int64(sqlite3_context pCtx, @Cast("sqlite3_int64") long l);
	static native void sqlite3_result_zeroblob(sqlite3_context pCtx, int n);

	static native void sqlite3_result_error(sqlite3_context pCtx,@Cast("const char*") BytePointer err, int length);
	static native void sqlite3_result_error_code(sqlite3_context pCtx, int errCode);
	static native void sqlite3_result_error_nomem(sqlite3_context pCtx);
	static native void sqlite3_result_error_toobig(sqlite3_context pCtx);
	//static native void sqlite3_result_subtype(sqlite3_context pCtx, /*unsigned*/ int subtype);

	static native @Const BytePointer sqlite3_value_blob(sqlite3_value pValue);
	static native int sqlite3_value_bytes(sqlite3_value pValue);
	static native double sqlite3_value_double(sqlite3_value pValue);
	static native int sqlite3_value_int(sqlite3_value pValue);
	static native @Cast("sqlite3_int64") long sqlite3_value_int64(sqlite3_value pValue);
	static native @Cast("const unsigned char*") BytePointer sqlite3_value_text(sqlite3_value pValue);
	static native int sqlite3_value_type(sqlite3_value pValue);
	static native int sqlite3_value_numeric_type(sqlite3_value pValue);

	static native Pointer sqlite3_get_auxdata(sqlite3_context pCtx, int n);
	static native void sqlite3_set_auxdata(sqlite3_context pCtx, int n, Pointer p, Destructor free);
	static native Pointer sqlite3_user_data(sqlite3_context pCtx);
	static native Pointer sqlite3_aggregate_context(sqlite3_context pCtx, int nBytes);
	static native sqlite3 sqlite3_context_db_handle(sqlite3_context pCtx);
	public static final Charset UTF_8 = Charset.forName("UTF-8");
	public static final String UTF_8_ECONDING = UTF_8.name();
File
SQLite.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
		 * Sets the return value of the application-defined function to be the text string given.
		 * @see sqlite3_result_text
		 */
<<<<<<< HEAD
		public void setResultText(BytePointer result) {
=======
		public void setResultText(String result) {
>>>>>>> 438ca2692bceae8a6efce6371cd1923cfdce9759
			sqlite3_result_text(this, result, -1, SQLITE_TRANSIENT);
		}
		/**
Solution content 
		 * Sets the return value of the application-defined function to be the text string given.
		 * @see sqlite3_result_text
		 */
		public void setResultText(BytePointer result) {
			sqlite3_result_text(this, result, -1, SQLITE_TRANSIENT);
		}
		/**
File
SQLite.java
Developer's decision
Version 1
Kind of conflict
Method signature