diff options
author | joerg <joerg@pkgsrc.org> | 2016-04-01 19:56:02 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2016-04-01 19:56:02 +0000 |
commit | 27ed4d067ca567b17a7a8ea1264136d1bdf71efe (patch) | |
tree | 4232047ddac4e82310252c562924b241d9095206 | |
parent | 122adb22ed1a73b44da00d96b9d23250ea671f0e (diff) | |
download | pkgsrc-27ed4d067ca567b17a7a8ea1264136d1bdf71efe.tar.gz |
Repeat after me:
I shall not "use namespace std;" before including 3rd party headers.
-rw-r--r-- | geography/opencpn/distinfo | 4 | ||||
-rw-r--r-- | geography/opencpn/patches/patch-src_printtable.cpp | 21 | ||||
-rw-r--r-- | geography/opencpn/patches/patch-src_routeprintout.cpp | 21 |
3 files changed, 45 insertions, 1 deletions
diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo index 5617699a524..3520c6724d4 100644 --- a/geography/opencpn/distinfo +++ b/geography/opencpn/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2016/03/23 14:54:39 bouyer Exp $ +$NetBSD: distinfo,v 1.7 2016/04/01 19:56:02 joerg Exp $ SHA1 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 39baa5f89ded9a5c62824e6e1445dbfc4f168578 RMD160 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = d344b9caffe40dabcad1d9ac148ce54d75f1573c @@ -16,4 +16,6 @@ SHA1 (patch-src_chcanv.cpp) = af76f36b6fd6d613720945195d5a24902012a020 SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 SHA1 (patch-src_glu_libtess_sweep.c) = 68e3e69239d8bdce353bcad0f5606be5b447b5a7 SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb +SHA1 (patch-src_printtable.cpp) = 940e7f42dd7e6a9776db2009027989ca79429cb1 +SHA1 (patch-src_routeprintout.cpp) = bbf135bd71e3fc87100b0c6d4e200f68754937c3 SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040 diff --git a/geography/opencpn/patches/patch-src_printtable.cpp b/geography/opencpn/patches/patch-src_printtable.cpp new file mode 100644 index 00000000000..c9ebebbfd7c --- /dev/null +++ b/geography/opencpn/patches/patch-src_printtable.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-src_printtable.cpp,v 1.1 2016/04/01 19:56:02 joerg Exp $ + +--- src/printtable.cpp.orig 2016-04-01 19:47:54.585451048 +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; diff --git a/geography/opencpn/patches/patch-src_routeprintout.cpp b/geography/opencpn/patches/patch-src_routeprintout.cpp new file mode 100644 index 00000000000..055a7fb62a0 --- /dev/null +++ b/geography/opencpn/patches/patch-src_routeprintout.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-src_routeprintout.cpp,v 1.1 2016/04/01 19:56:02 joerg Exp $ + +--- src/routeprintout.cpp.orig 2016-04-01 19:46:52.064847404 +0000 ++++ src/routeprintout.cpp +@@ -24,7 +24,6 @@ + **************************************************************************/ + + #include <iostream> +-using namespace std; + + #include "wx/wxprec.h" + +@@ -72,6 +71,8 @@ using namespace std; + #include "printtable.h" + #include "wx28compat.h" + ++using namespace std; ++ + #define PRINT_WP_NAME 0 + #define PRINT_WP_POSITION 1 + #define PRINT_WP_COURSE 2 |