svn commit: r412545 - branches/2016Q2/comms/telldus-core/files

[Dimitry Andric]

Author: dim (src committer)
Date: Tue Apr  5 06:57:51 2016
New Revision: 412545
URL: https://svnweb.freebsd.org/changeset/ports/412545

Log:
  MFH: r412524
  
  During the exp-run in bug 208158, it was found that comms/telldus-core
  gives errors with libc++ 3.8.0 [1]:
  
  /wrkdirs/usr/ports/comms/telldus-core/work/telldus-core-2.1.2/service/ProtocolNexa.cpp:59:8: error: call to member function 'insert' is ambiguous
                          str.insert(0, 1, 2);  // Repeat two times
                          ~~~~^~~~~~
  
  This is because the third argument to this std::string method is
  supposed to be a char, not an integer.  Fix it by using '\x2' instead.
  
  [1] http://package18.nyi.freebsd.org/data/headamd64PR208158-default/2016-03-22_18h30m05s/logs/errors/telldus-core-2.1.2_1.log
  
  Approved by:	portmgr (junovitch)
  Approved by:	johan at stromnet.se (maintainer)
  PR:		208523

Added:
  branches/2016Q2/comms/telldus-core/files/patch-service-ProtocolNexa.cpp
     - copied unchanged from r412524, head/comms/telldus-core/files/patch-service-ProtocolNexa.cpp
Modified:
Directory Properties:
  branches/2016Q2/   (props changed)

Copied: branches/2016Q2/comms/telldus-core/files/patch-service-ProtocolNexa.cpp (from r412524, head/comms/telldus-core/files/patch-service-ProtocolNexa.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q2/comms/telldus-core/files/patch-service-ProtocolNexa.cpp	Tue Apr  5 06:57:51 2016	(r412545, copy of r412524, head/comms/telldus-core/files/patch-service-ProtocolNexa.cpp)
@@ -0,0 +1,11 @@
+--- service/ProtocolNexa.cpp.orig	2014-03-31 12:30:09.000000000 +0200
++++ service/ProtocolNexa.cpp	2016-04-04 13:32:35.124699000 +0200
+@@ -56,7 +56,7 @@ std::string ProtocolNexa::getStringForMe
+ 			// We also return the last packet so Device::doAction() doesn't
+ 			// report TELLSTICK_ERROR_METHOD_NOT_SUPPORTED
+ 
+-			str.insert(0, 1, 2);  // Repeat two times
++			str.insert(0, 1, '\x2');  // Repeat two times
+ 			str.insert(0, 1, 'R');
+ 			for (int i = 0; i < 5; ++i) {
+ 				controller->send(str);