[
https://issues.apache.org/jira/browse/ARROW-1737?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16220891#comment-16220891
]
ASF GitHub Bot commented on ARROW-1737:
---------------------------------------
wesm closed pull request #1254: ARROW-1737: [GLib] Use G_DECLARE_DERIVABLE_TYPE
URL: https://github.com/apache/arrow/pull/1254
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/c_glib/arrow-glib/array-builder.h
b/c_glib/arrow-glib/array-builder.h
index 7a53bff11..d9e91212e 100644
--- a/c_glib/arrow-glib/array-builder.h
+++ b/c_glib/arrow-glib/array-builder.h
@@ -25,11 +25,15 @@
G_BEGIN_DECLS
#define GARROW_TYPE_ARRAY_BUILDER (garrow_array_builder_get_type())
-GARROW_DECLARE_TYPE(GArrowArrayBuilder,
- garrow_array_builder,
- GARROW,
- ARRAY_BUILDER,
- GObject)
+G_DECLARE_DERIVABLE_TYPE(GArrowArrayBuilder,
+ garrow_array_builder,
+ GARROW,
+ ARRAY_BUILDER,
+ GObject)
+struct _GArrowArrayBuilderClass
+{
+ GObjectClass parent_class;
+};
GArrowArray *garrow_array_builder_finish (GArrowArrayBuilder *builder,
GError **error);
@@ -156,11 +160,15 @@ gboolean
garrow_int_array_builder_append_nulls(GArrowIntArrayBuilder *builder,
#define GARROW_TYPE_UINT_ARRAY_BUILDER (garrow_uint_array_builder_get_type())
-GARROW_DECLARE_TYPE(GArrowUIntArrayBuilder,
- garrow_uint_array_builder,
- GARROW,
- UINT_ARRAY_BUILDER,
- GArrowArrayBuilder)
+G_DECLARE_DERIVABLE_TYPE(GArrowUIntArrayBuilder,
+ garrow_uint_array_builder,
+ GARROW,
+ UINT_ARRAY_BUILDER,
+ GArrowArrayBuilder)
+struct _GArrowUIntArrayBuilderClass
+{
+ GArrowArrayBuilderClass parent_class;
+};
GArrowUIntArrayBuilder *garrow_uint_array_builder_new(void);
diff --git a/c_glib/arrow-glib/compute.h b/c_glib/arrow-glib/compute.h
index cdae5790e..cd9dd2b63 100644
--- a/c_glib/arrow-glib/compute.h
+++ b/c_glib/arrow-glib/compute.h
@@ -24,11 +24,15 @@
G_BEGIN_DECLS
#define GARROW_TYPE_CAST_OPTIONS (garrow_cast_options_get_type())
-GARROW_DECLARE_TYPE(GArrowCastOptions,
- garrow_cast_options,
- GARROW,
- CAST_OPTIONS,
- GObject)
+G_DECLARE_DERIVABLE_TYPE(GArrowCastOptions,
+ garrow_cast_options,
+ GARROW,
+ CAST_OPTIONS,
+ GObject)
+struct _GArrowCastOptionsClass
+{
+ GObjectClass parent_class;
+};
GArrowCastOptions *garrow_cast_options_new(void);
diff --git a/c_glib/arrow-glib/gobject-type.h b/c_glib/arrow-glib/gobject-type.h
index a2f8397b9..41e3a2953 100644
--- a/c_glib/arrow-glib/gobject-type.h
+++ b/c_glib/arrow-glib/gobject-type.h
@@ -21,27 +21,12 @@
#include <glib-object.h>
-#ifdef G_DECLARE_DERIVABLE_TYPE
-# define GARROW_DECLARE_TYPE(ObjectName, \
- object_name, \
- MODULE_NAME, \
- OBJECT_NAME, \
- ParentName) \
- G_DECLARE_DERIVABLE_TYPE(ObjectName, \
- object_name, \
- MODULE_NAME, \
- OBJECT_NAME, \
- ParentName) \
- struct _ ## ObjectName ## Class \
- { \
- ParentName ## Class parent_class; \
- };
-#else
-# define GARROW_DECLARE_TYPE(ObjectName, \
- object_name, \
- MODULE_NAME, \
- OBJECT_NAME, \
- ParentName) \
+#ifndef G_DECLARE_DERIVABLE_TYPE
+# define G_DECLARE_DERIVABLE_TYPE(ObjectName, \
+ object_name, \
+ MODULE_NAME, \
+ OBJECT_NAME, \
+ ParentName) \
typedef struct _ ## ObjectName ObjectName; \
typedef struct _ ## ObjectName ## Class ObjectName ## Class; \
\
@@ -50,11 +35,6 @@
ParentName parent_instance; \
}; \
\
- struct _ ## ObjectName ## Class \
- { \
- ParentName ## Class parent_class; \
- }; \
- \
GType object_name ## _get_type(void) G_GNUC_CONST; \
\
static inline ObjectName * \
diff --git a/c_glib/arrow-glib/reader.h b/c_glib/arrow-glib/reader.h
index 964146ab8..daec676d6 100644
--- a/c_glib/arrow-glib/reader.h
+++ b/c_glib/arrow-glib/reader.h
@@ -31,11 +31,15 @@
G_BEGIN_DECLS
#define GARROW_TYPE_RECORD_BATCH_READER (garrow_record_batch_reader_get_type())
-GARROW_DECLARE_TYPE(GArrowRecordBatchReader,
- garrow_record_batch_reader,
- GARROW,
- RECORD_BATCH_READER,
- GObject)
+G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchReader,
+ garrow_record_batch_reader,
+ GARROW,
+ RECORD_BATCH_READER,
+ GObject)
+struct _GArrowRecordBatchReaderClass
+{
+ GObjectClass parent_class;
+};
GArrowSchema *garrow_record_batch_reader_get_schema(
GArrowRecordBatchReader *reader);
@@ -57,11 +61,15 @@ GArrowRecordBatch *garrow_record_batch_reader_read_next(
#define GARROW_TYPE_TABLE_BATCH_READER (garrow_table_batch_reader_get_type())
-GARROW_DECLARE_TYPE(GArrowTableBatchReader,
- garrow_table_batch_reader,
- GARROW,
- TABLE_BATCH_READER,
- GArrowRecordBatchReader)
+G_DECLARE_DERIVABLE_TYPE(GArrowTableBatchReader,
+ garrow_table_batch_reader,
+ GARROW,
+ TABLE_BATCH_READER,
+ GArrowRecordBatchReader)
+struct _GArrowTableBatchReaderClass
+{
+ GArrowRecordBatchReaderClass parent_class;
+};
GArrowTableBatchReader *garrow_table_batch_reader_new(GArrowTable *table);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> [GLib] Use G_DECLARE_DERIVABLE_TYPE
> -----------------------------------
>
> Key: ARROW-1737
> URL: https://issues.apache.org/jira/browse/ARROW-1737
> Project: Apache Arrow
> Issue Type: Improvement
> Components: GLib
> Reporter: Kouhei Sutou
> Assignee: Kouhei Sutou
> Labels: pull-request-available
> Fix For: 0.8.0
>
>
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
