Date: Mon, 27 Aug 2018 20:16:26 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478249 - head/devel/pypersrc/files Message-ID: <201808272016.w7RKGQ0x008204@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Aug 27 20:16:25 2018 New Revision: 478249 URL: https://svnweb.freebsd.org/changeset/ports/478249 Log: devel/pypersrc: Fix build with Clang 6 src/cc/pyext_DequeChar.cc:62:25: error: no matching function for call to 'make_pair' sDequeCharMap.insert( make_pair<PyObject*,DequeChar*>(self,dequeChar) ); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ http://beefy11.nyi.freebsd.org/data/head-i386-default/p477696_s338122/logs/errors/pypersrc-20120106_3.log Added: head/devel/pypersrc/files/patch-src_cc_pyext__DequeChar.cc (contents, props changed) head/devel/pypersrc/files/patch-src_cc_pyext__GreedyDict.cc (contents, props changed) head/devel/pypersrc/files/patch-src_cc_pyext__Tags.cc (contents, props changed) Added: head/devel/pypersrc/files/patch-src_cc_pyext__DequeChar.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pypersrc/files/patch-src_cc_pyext__DequeChar.cc Mon Aug 27 20:16:25 2018 (r478249) @@ -0,0 +1,11 @@ +--- src/cc/pyext_DequeChar.cc.orig 2018-08-27 20:06:18 UTC ++++ src/cc/pyext_DequeChar.cc +@@ -59,7 +59,7 @@ DequeChar_New( PyObject* nil, PyObject* args ) + { + // Create a DequeChar C++ object and associate with a Python self object. + DequeChar* dequeChar = new DequeChar(); +- sDequeCharMap.insert( make_pair<PyObject*,DequeChar*>(self,dequeChar) ); ++ sDequeCharMap.insert( make_pair(self,dequeChar) ); + } + PY_RETURN_NONE + } Added: head/devel/pypersrc/files/patch-src_cc_pyext__GreedyDict.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pypersrc/files/patch-src_cc_pyext__GreedyDict.cc Mon Aug 27 20:16:25 2018 (r478249) @@ -0,0 +1,11 @@ +--- src/cc/pyext_GreedyDict.cc.orig 2018-08-27 20:07:54 UTC ++++ src/cc/pyext_GreedyDict.cc +@@ -57,7 +57,7 @@ GreedyDict_New( PyObject* nil, PyObject* args ) + { + // Create a GreedyDict C++ object and associate with a Python self object. + GreedyDict* greedyDict = new GreedyDict( hintKeySize ); +- sGreedyDictMap.insert( make_pair<PyObject*,GreedyDict*>(self,greedyDict) ); ++ sGreedyDictMap.insert( make_pair(self,greedyDict) ); + } + PY_RETURN_NONE + } Added: head/devel/pypersrc/files/patch-src_cc_pyext__Tags.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pypersrc/files/patch-src_cc_pyext__Tags.cc Mon Aug 27 20:16:25 2018 (r478249) @@ -0,0 +1,22 @@ +--- src/cc/pyext_Tags.cc.orig 2018-08-27 20:08:28 UTC ++++ src/cc/pyext_Tags.cc +@@ -122,8 +122,8 @@ static Tags sTags; + else \ + { \ + ++NUM_VAR; \ +- MAP_STR_NUM.insert( make_pair<string,Tags::TagInt>(str, NUM_VAR) ); \ +- MAP_NUM_STR.insert( make_pair<Tags::TagInt,string>(NUM_VAR, str) ); \ ++ MAP_STR_NUM.insert( make_pair(str, NUM_VAR) ); \ ++ MAP_NUM_STR.insert( make_pair(NUM_VAR, str) ); \ + return NUM_VAR; \ + } \ + } +@@ -248,7 +248,7 @@ Tags::Insert( const char* pTagName, const char* pTagTy + string tagName(pTagName); + // TagVal val( string(pTagName), typeNum, fileNum, tagLine ); // g++ 2.9 won't compile this + TagVal val( tagName, typeNum, fileNum, tagLine ); // value holds tag name's original case +- mTagMap.insert( make_pair<string,TagVal>(key, val) ); ++ mTagMap.insert( make_pair(key, val) ); + return true; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808272016.w7RKGQ0x008204>