diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-10-04 15:01:21 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-10-04 15:01:21 +0500 |
| commit | e99850774b67f012f078c1a2b36f27dbbea8e804 (patch) | |
| tree | 211adc0e49fda5189a5ba68ecef77f755f5a55dc /sql/gcalc_tools.h | |
| parent | 6e7d578b2b3fad8671504785b757e53b11516b22 (diff) | |
| download | mariadb-git-e99850774b67f012f078c1a2b36f27dbbea8e804.tar.gz | |
GIS library code cleanup.
GCALC_DBUG_OFF and related infrastructure defined so we can enable/disable debugging conveniently.
per-file comments:
sql/gcalc_slicescan.cc
GIS library code cleanup.
sql/gcalc_slicescan.h
GIS library code cleanup.
sql/gcalc_tools.cc
GIS library code cleanup.
sql/gcalc_tools.h
GIS library code cleanup.
Diffstat (limited to 'sql/gcalc_tools.h')
| -rw-r--r-- | sql/gcalc_tools.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sql/gcalc_tools.h b/sql/gcalc_tools.h index d79ba630506..d1087aa83b2 100644 --- a/sql/gcalc_tools.h +++ b/sql/gcalc_tools.h @@ -222,9 +222,9 @@ public: int get_result(Gcalc_result_receiver *storage); void reset(); -#ifndef DBUG_OFF +#ifndef GCALC_DBUG_OFF int n_res_points; -#endif /*DBUG_OFF*/ +#endif /*GCALC_DBUG_OFF*/ class res_point : public Gcalc_dyn_list::Item { public: @@ -235,23 +235,19 @@ public: const Gcalc_heap::Intersection_info *ii; res_point *first_poly_node; }; -#ifdef TMP_BLOCK union { -#endif /*TMP_BLOCK*/ res_point *outer_poly; uint32 poly_position; -#ifdef TMP_BLOCK }; -#endif /*TMP_BLOCK*/ res_point *up; res_point *down; res_point *glue; Gcalc_function::shape_type type; Gcalc_dyn_list::Item **prev_hook; -#ifndef DBUG_OFF +#ifndef GCALC_DBUG_OFF int point_n; -#endif /*DBUG_OFF*/ +#endif /*GCALC_DBUG_OFF*/ void set(const Gcalc_scan_iterator *si); res_point *get_next() { return (res_point *)next; } }; |