Mon Sep 25 22:31:25 2017 UTC ()
Reduce namespace pollution.


(joerg)
diff -r1.14 -r1.15 pkgsrc/geography/opencpn/distinfo
diff -r0 -r1.3 pkgsrc/geography/opencpn/patches/patch-src_printtable.cpp
diff -r0 -r1.3 pkgsrc/geography/opencpn/patches/patch-src_routeprintout.cpp

cvs diff -r1.14 -r1.15 pkgsrc/geography/opencpn/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/opencpn/distinfo 2017/09/12 17:31:20 1.14
+++ pkgsrc/geography/opencpn/distinfo 2017/09/25 22:31:25 1.15
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1$NetBSD: distinfo,v 1.14 2017/09/12 17:31:20 bouyer Exp $ 1$NetBSD: distinfo,v 1.15 2017/09/25 22:31:25 joerg Exp $
2 2
3SHA1 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 33ecc34915951c270fd758ec00a69574bc44ea25 3SHA1 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 33ecc34915951c270fd758ec00a69574bc44ea25
4RMD160 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 084ad8ace3336954402a17b7610c3e2807a270a1 4RMD160 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 084ad8ace3336954402a17b7610c3e2807a270a1
5SHA512 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = eed40678a6ff8cae45da0e44cbf3fe1d65c2a76668ecc26bbbc15a845e1c937f54a424ab6c1776dd3d74348d67ac6e11f7381da3f5132cbf680528dcc7184fc0 5SHA512 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = eed40678a6ff8cae45da0e44cbf3fe1d65c2a76668ecc26bbbc15a845e1c937f54a424ab6c1776dd3d74348d67ac6e11f7381da3f5132cbf680528dcc7184fc0
6Size (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 56307636 bytes 6Size (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 56307636 bytes
7SHA1 (patch-CMakeLists.txt) = c20b25c64790f5a595a5ef2940f430e588ffdf14 7SHA1 (patch-CMakeLists.txt) = c20b25c64790f5a595a5ef2940f430e588ffdf14
8SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a 8SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
9SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85 9SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85
10SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65 10SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65
11SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da180c263c231e 11SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da180c263c231e
12SHA1 (patch-plugins_demo_pi_sample_CMakeLists.txt) = 6fde2dae588e0d8250bd1e0d60a465fb20d9a599 12SHA1 (patch-plugins_demo_pi_sample_CMakeLists.txt) = 6fde2dae588e0d8250bd1e0d60a465fb20d9a599
13SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49 13SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49
14SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046 14SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046
15SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a 15SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a
16SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6 16SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
17SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 17SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
18SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62 18SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62
19SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb 19SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
20SHA1 (patch-src_ocpndc.cpp) = cd425bec24050176a08e7ec8280bf853fd10c756 20SHA1 (patch-src_ocpndc.cpp) = cd425bec24050176a08e7ec8280bf853fd10c756
 21SHA1 (patch-src_printtable.cpp) = 52ed0f09610d56e9acc5ec9b8e4cbdc7ad55d043
 22SHA1 (patch-src_routeprintout.cpp) = c0f960b76b1b7a8acb7e5faca5f656a5c259f02c
21SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040 23SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040

File Added: pkgsrc/geography/opencpn/patches/patch-src_printtable.cpp
$NetBSD: patch-src_printtable.cpp,v 1.3 2017/09/25 22:31:25 joerg Exp $

Repeat after me: I don't know what 3rd party headers are doing, so I
won't inflict my namespace decisions on them.

--- src/printtable.cpp.orig	2017-09-25 20:13:02.634455468 +0000
+++ src/printtable.cpp
@@ -28,7 +28,6 @@
 #include <sstream>
 #include <vector>
 #include <algorithm>
-using namespace std;
 
 #include "wx/wxprec.h"
 
@@ -74,6 +73,8 @@ using namespace std;
 
 #include "printtable.h"
 
+using namespace std;
+
 void PrintCell::Init( const wxString& _content, wxDC* _dc, int _width, int _cellpadding, bool _bold_font )
 {
     bold_font   = _bold_font;

File Added: pkgsrc/geography/opencpn/patches/patch-src_routeprintout.cpp
$NetBSD: patch-src_routeprintout.cpp,v 1.3 2017/09/25 22:31:25 joerg Exp $

Repeat after me: I don't know what 3rd party headers are doing, so I
won't inflict my namespace decisions on them.

--- src/routeprintout.cpp.orig	2017-09-25 20:10:38.997900156 +0000
+++ src/routeprintout.cpp
@@ -24,7 +24,6 @@
  **************************************************************************/
 
 #include <iostream>
-using namespace std;
 
 #include "wx/wxprec.h"
 
@@ -79,6 +78,8 @@ using namespace std;
 #define PRINT_WP_DISTANCE 3
 #define PRINT_WP_DESCRIPTION 4
 
+using namespace std;
+
 // Global print data, to remember settings during the session
 extern wxPrintData*     g_printData;
 // Global page setup data