diff options
author | Ryan Hill <rhill@gentoo.org> | 2016-02-16 17:50:46 -0600 |
---|---|---|
committer | Ryan Hill <rhill@gentoo.org> | 2016-02-16 17:51:08 -0600 |
commit | ef9003abf6bfae6ec8ba8ee54a1bdc785a53f6f9 (patch) | |
tree | 519ea4404fbc9af3ef9895666685683a54fa2d40 /app-pda/barry/files | |
parent | Merge remote-tracking branch 'github/pr/868'. (diff) | |
download | gentoo-ef9003abf6bfae6ec8ba8ee54a1bdc785a53f6f9.tar.gz gentoo-ef9003abf6bfae6ec8ba8ee54a1bdc785a53f6f9.tar.bz2 gentoo-ef9003abf6bfae6ec8ba8ee54a1bdc785a53f6f9.zip |
app-pda/barry: Build with -std=c++11 for libsigc++ compatibility (bug #566910).
Package-Manager: portage-2.2.27
Diffstat (limited to 'app-pda/barry/files')
-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; |