summaryrefslogtreecommitdiff
path: root/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2012-01-23 08:58:00 +0000
committeradam <adam@pkgsrc.org>2012-01-23 08:58:00 +0000
commit17ab9b341d1b2fcc35332047d033d2c450ee0977 (patch)
treeaee5387d32fdba925822bbe551e82d305660421b /geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h
parent4ad7ab2a65055a172c6eb4f994cb7cc1420ac3d1 (diff)
downloadpkgsrc-17ab9b341d1b2fcc35332047d033d2c450ee0977.tar.gz
Changes 1.7.3:
* Fix 3581 Ftools: union tool leave holes in output * Fix 4500 Simplify tool freezes QGIS * Fix 4466 Fixes for 'v.what.vect' and 'v.generalize' modules in the GRASS plugin * Fix 4552 Patch for v.what.vect * Fix 4035 Print Composer shape combo box not refecting current shape * Partial Fix 3097 Add preference to set/override environment variables * Fix 2749 Move 'Add to Attributes List' button * Fix 4560 Wrong scale displayed in Map canvas * Partial Fix 4383 Ftools: Improve how processes are handled * Fix 3577 Adding a print composer doesn't dirty the document * Fix 3170 Many GDAL Tools don't work in OS X standalone * Fix 3723 Transparency settings are not applied from *.qml * Fix 3576 qml not read automagically for rasters * Fix 2977 Messy uninstallation of the standalone installer * Union and Symetrical difference works only on whole layer fixed * Save some time in node tool for geometry export and avoid detachs * Initialize default symbol to 0 in rule based renderer * Make relative paths default * Fix tab restoration in project properties * Add helpful info to GdalTools Settings dialog on how to configure GDAL path * New vector layer dialog - show CRS as authid-description pair instead of proj4 string * Fix crash with relative file paths if projPath is not yet defined * Add helpful info to GdalTools Settings dialog on how to configure GDAL path * And a lot of other smaller Bugfixes
Diffstat (limited to 'geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h')
-rw-r--r--geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h24
1 files changed, 24 insertions, 0 deletions
diff --git a/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h b/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h
new file mode 100644
index 00000000000..4ab1814ba91
--- /dev/null
+++ b/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_core_spatialindex_include_Tools.h,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix building with Clang.
+
+--- src/core/spatialindex/include/Tools.h.orig 2011-06-07 07:42:08.000000000 +0000
++++ src/core/spatialindex/include/Tools.h
+@@ -407,7 +407,7 @@ namespace Tools
+ private:
+ std::map<std::string, Variant> m_propertySet;
+
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__clang__)
+ // MSVC's friend function syntax differs slightly from everyone elses:
+ // don't seem to need to qualify function name.
+ friend std::ostream& operator<<(
+@@ -620,7 +620,7 @@ namespace Tools
+ unsigned long long* m_a;
+ unsigned long m_k;
+
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__clang__)
+ // MSVC's friend function syntax differs slightly from everyone elses
+ // don't seem to need to qualify function name.
+ friend std::ostream& operator<<(