[genius] Fri Feb 13 11:46:57 2015 Jiri (George) Lebl <jirka 5z com>
- From: George Lebl <jirka src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [genius] Fri Feb 13 11:46:57 2015 Jiri (George) Lebl <jirka 5z com>
- Date: Fri, 13 Feb 2015 17:47:27 +0000 (UTC)
commit 0840ae8999daf9d388c4291f106807a929d5c091
Author: Jiri (George) Lebl <jiri lebl gmail com>
Date: Fri Feb 13 11:47:05 2015 -0600
Fri Feb 13 11:46:57 2015 Jiri (George) Lebl <jirka 5z com>
* gtkextra/*.c: remove the inline from roundint. Probably not
a performance bottleneck to begin with and likely the
compiler will inline by itself hopefully. Removes compilation
errors with GCC5
ChangeLog | 7 +++++++
gtkextra/gtkplot.c | 4 ++--
gtkextra/gtkplot3d.c | 2 +-
gtkextra/gtkplotbar.c | 2 +-
gtkextra/gtkplotbox.c | 2 +-
gtkextra/gtkplotcairo.c | 2 +-
gtkextra/gtkplotcandle.c | 2 +-
gtkextra/gtkplotcanvas.c | 2 +-
gtkextra/gtkplotcanvasellipse.c | 2 +-
gtkextra/gtkplotcanvasplot.c | 2 +-
gtkextra/gtkplotcanvasrectangle.c | 2 +-
gtkextra/gtkplotcanvastext.c | 2 +-
gtkextra/gtkplotcsurface.c | 2 +-
gtkextra/gtkplotdata.c | 2 +-
gtkextra/gtkplotflux.c | 2 +-
gtkextra/gtkplotgdk.c | 2 +-
gtkextra/gtkplotpixmap.c | 2 +-
gtkextra/gtkplotpolar.c | 2 +-
gtkextra/gtkplotsurface.c | 2 +-
19 files changed, 26 insertions(+), 19 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ab5a318..524e6a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 13 11:46:57 2015 Jiri (George) Lebl <jirka 5z com>
+
+ * gtkextra/*.c: remove the inline from roundint. Probably not
+ a performance bottleneck to begin with and likely the
+ compiler will inline by itself hopefully. Removes compilation
+ errors with GCC5
+
Fri Jan 09 18:19:44 2015 Jiri (George) Lebl <jirka 5z com>
* examples/eulers-method-graphs-exp.gel: present plot window after
diff --git a/gtkextra/gtkplot.c b/gtkextra/gtkplot.c
index b9affcb..add338c 100644
--- a/gtkextra/gtkplot.c
+++ b/gtkextra/gtkplot.c
@@ -231,7 +231,7 @@ static void gtk_plot_real_get_point (GtkWidget *widget,
gdouble *px, gdouble *py);
void gtk_plot_remove_dimension (GtkPlot *plot,
const gchar *dimension);
-inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static void update_datasets (GtkPlot *plot, gboolean new_range);
static GtkWidgetClass *parent_class = NULL;
@@ -3726,7 +3726,7 @@ gtk_plot_ticks_inverse(GtkPlotAxis *axis, gdouble x)
return point;
}
-inline gint
+gint
roundint (gdouble x)
{
return (x+.50999999471);
diff --git a/gtkextra/gtkplot3d.c b/gtkextra/gtkplot3d.c
index 5530189..270003a 100644
--- a/gtkextra/gtkplot3d.c
+++ b/gtkextra/gtkplot3d.c
@@ -139,7 +139,7 @@ static void gtk_plot3d_real_get_pixel (GtkWidget *widget,
gdouble *px,
gdouble *py,
gdouble *pz);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotClass *parent_class = NULL;
diff --git a/gtkextra/gtkplotbar.c b/gtkextra/gtkplotbar.c
index be11db4..62a8970 100644
--- a/gtkextra/gtkplotbar.c
+++ b/gtkextra/gtkplotbar.c
@@ -63,7 +63,7 @@ static void gtk_plot_bar_draw_legend (GtkPlotData *data,
gint x, gint y);
static void gtk_plot_bar_clone (GtkPlotData *data, GtkPlotData *copy);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
enum {
ARG_0,
diff --git a/gtkextra/gtkplotbox.c b/gtkextra/gtkplotbox.c
index 97a2a24..f16ba62 100644
--- a/gtkextra/gtkplotbox.c
+++ b/gtkextra/gtkplotbox.c
@@ -62,7 +62,7 @@ static void gtk_plot_box_draw_symbol (GtkPlotData *data,
gdouble da);
static void gtk_plot_box_clone (GtkPlotData *data, GtkPlotData *copy);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
enum {
ARG_0,
diff --git a/gtkextra/gtkplotcairo.c b/gtkextra/gtkplotcairo.c
index ef4c4b0..8b7cfd8 100644
--- a/gtkextra/gtkplotcairo.c
+++ b/gtkextra/gtkplotcairo.c
@@ -119,7 +119,7 @@ static void gtk_plot_cairo_draw_pixmap (GtkPlotPC *pc,
gdouble scale_x,
gdouble scale_y);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotPCClass *parent_class = NULL;
diff --git a/gtkextra/gtkplotcandle.c b/gtkextra/gtkplotcandle.c
index 7fc0a3f..406708c 100644
--- a/gtkextra/gtkplotcandle.c
+++ b/gtkextra/gtkplotcandle.c
@@ -42,7 +42,7 @@ static void gtk_plot_candle_draw_symbol (GtkPlotData *data,
gdouble dz,
gdouble da);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotDataClass *parent_class = NULL;
diff --git a/gtkextra/gtkplotcanvas.c b/gtkextra/gtkplotcanvas.c
index 1ab387e..b957595 100644
--- a/gtkextra/gtkplotcanvas.c
+++ b/gtkextra/gtkplotcanvas.c
@@ -144,7 +144,7 @@ static void gtk_plot_canvas_child_draw (GtkPlotCanvas *canvas,
/* Auxiliary functions */
GtkPlotCanvasPos possible_selection (GtkAllocation area,
gint x, gint y);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
/* Signals */
diff --git a/gtkextra/gtkplotcanvasellipse.c b/gtkextra/gtkplotcanvasellipse.c
index 0dd6379..e08d7c6 100644
--- a/gtkextra/gtkplotcanvasellipse.c
+++ b/gtkextra/gtkplotcanvasellipse.c
@@ -71,7 +71,7 @@ static void gtk_plot_canvas_ellipse_set_property(GObject *object,
GParamSpec *pspec);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotCanvasChildClass *parent_class = NULL;
GType
diff --git a/gtkextra/gtkplotcanvasplot.c b/gtkextra/gtkplotcanvasplot.c
index f4ee8ad..585bea6 100644
--- a/gtkextra/gtkplotcanvasplot.c
+++ b/gtkextra/gtkplotcanvasplot.c
@@ -67,7 +67,7 @@ static void gtk_plot_canvas_plot_button_release (GtkPlotCanvas *canvas,
GtkPlotCanvasChild *child);
static void reset_plot_allocation (GtkPlotCanvas *canvas,
GtkPlotCanvasPlot *child);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotCanvasChildClass *parent_class = NULL;
extern GtkPlotCanvasPos possible_selection (GtkAllocation area,
diff --git a/gtkextra/gtkplotcanvasrectangle.c b/gtkextra/gtkplotcanvasrectangle.c
index 6c32d76..d5a767c 100644
--- a/gtkextra/gtkplotcanvasrectangle.c
+++ b/gtkextra/gtkplotcanvasrectangle.c
@@ -68,7 +68,7 @@ static void gtk_plot_canvas_rectangle_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotCanvasChildClass *parent_class = NULL;
GType
diff --git a/gtkextra/gtkplotcanvastext.c b/gtkextra/gtkplotcanvastext.c
index 61b2db6..11ce852 100644
--- a/gtkextra/gtkplotcanvastext.c
+++ b/gtkextra/gtkplotcanvastext.c
@@ -61,7 +61,7 @@ static void gtk_plot_canvas_text_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotCanvasChildClass *parent_class = NULL;
GType
diff --git a/gtkextra/gtkplotcsurface.c b/gtkextra/gtkplotcsurface.c
index f58253d..3ed3f2b 100644
--- a/gtkextra/gtkplotcsurface.c
+++ b/gtkextra/gtkplotcsurface.c
@@ -95,7 +95,7 @@ static void gtk_plot_csurface_lighting (GdkColor *a,
gdouble normal,
gdouble ambient);
static void clear_polygons (GtkPlotCSurface *surface);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static void hsv_to_rgb (gdouble h,
gdouble s,
gdouble v,
diff --git a/gtkextra/gtkplotdata.c b/gtkextra/gtkplotdata.c
index 1b67de8..120119a 100644
--- a/gtkextra/gtkplotdata.c
+++ b/gtkextra/gtkplotdata.c
@@ -137,7 +137,7 @@ static void gtk_plot_data_draw_star (GtkPlotData *data,
static void gtk_plot_data_connect_points (GtkPlotData *data,
gint npoints);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static void spline_solve (int n,
gdouble x[], gdouble y[],
gdouble y2[]);
diff --git a/gtkextra/gtkplotflux.c b/gtkextra/gtkplotflux.c
index 86274a3..bdb491e 100644
--- a/gtkextra/gtkplotflux.c
+++ b/gtkextra/gtkplotflux.c
@@ -67,7 +67,7 @@ static void gtk_plot_flux_draw_arrow (GtkPlotFlux *flux,
gdouble x2, gdouble y2);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
enum {
ARG_0,
diff --git a/gtkextra/gtkplotgdk.c b/gtkextra/gtkplotgdk.c
index 8becc9c..47e8f66 100644
--- a/gtkextra/gtkplotgdk.c
+++ b/gtkextra/gtkplotgdk.c
@@ -130,7 +130,7 @@ static GdkBitmap * scale_bitmap (GdkWindow *window,
gdouble scale_x,
gdouble scale_y);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotPCClass *parent_class = NULL;
diff --git a/gtkextra/gtkplotpixmap.c b/gtkextra/gtkplotpixmap.c
index d7655c0..a454719 100644
--- a/gtkextra/gtkplotpixmap.c
+++ b/gtkextra/gtkplotpixmap.c
@@ -74,7 +74,7 @@ static void gtk_plot_pixmap_set_property (GObject *object,
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotDataClass *parent_class = NULL;
diff --git a/gtkextra/gtkplotpolar.c b/gtkextra/gtkplotpolar.c
index 9e3e395..fc9b64e 100644
--- a/gtkextra/gtkplotpolar.c
+++ b/gtkextra/gtkplotpolar.c
@@ -71,7 +71,7 @@ static void gtk_plot_polar_real_get_point (GtkWidget *widget,
gint py,
gdouble *x,
gdouble *y);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static GtkPlotClass *parent_class = NULL;
diff --git a/gtkextra/gtkplotsurface.c b/gtkextra/gtkplotsurface.c
index cf010a6..3fbb0ad 100644
--- a/gtkextra/gtkplotsurface.c
+++ b/gtkextra/gtkplotsurface.c
@@ -71,7 +71,7 @@ static void gtk_plot_surface_lighting (GdkColor *a,
gdouble normal,
gdouble ambient);
static void clear_polygons (GtkPlotSurface *surface);
-extern inline gint roundint (gdouble x);
+gint roundint (gdouble x);
static void hsv_to_rgb (gdouble h,
gdouble s,
gdouble v,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
