diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-pda/barry/files/barry-0.18.4-shared_ptr.patch |
reinit the tree, so we can have metadata
Diffstat (limited to 'app-pda/barry/files/barry-0.18.4-shared_ptr.patch')
-rw-r--r-- | app-pda/barry/files/barry-0.18.4-shared_ptr.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/app-pda/barry/files/barry-0.18.4-shared_ptr.patch b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch new file mode 100644 index 000000000000..dbccfe66ea21 --- /dev/null +++ b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch @@ -0,0 +1,25 @@ +With -std=c++-11 shared_ptr is available in the standard library so pulling in +the std::tr1 namespace creates an ambiguous reference. Simple fix is to stop +doing that but isn't backwards compatible. We don't care in Gentoo since we'll +always be building barry with -std=c++11 due to libsigc++ abi compatibility. + +--- a/tools/bio.cc ++++ b/tools/bio.cc +@@ -42,7 +42,6 @@ + #include "i18n.h" + + using namespace std; +-using namespace std::tr1; + using namespace Barry; + + // keeping a record of all the -i device / -o device pin numbers, so +--- a/tools/btool.cc ++++ b/tools/btool.cc +@@ -59,7 +59,6 @@ + #include "barrygetopt.h" + + using namespace std; +-using namespace std::tr1; + using namespace Barry; + + std::map<std::string, std::string> SortKeys; |