head	1.2;
access;
symbols
	pkgsrc-2019Q3:1.1.0.32
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.30
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.28
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.26
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.24
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.22
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.20
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.18
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.16
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.12
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.10
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.8
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.6
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.4
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.2;
locks; strict;
comment	@// @;


1.2
date	2019.11.21.06.35.45;	author markd;	state dead;
branches;
next	1.1;
commitid	QRT6Q4f4SpK0vGLB;

1.1
date	2016.05.07.10.06.40;	author joerg;	state Exp;
branches
	1.1.2.1;
next	;
commitid	4vS4d9qjrkM4ex5z;

1.1.2.1
date	2016.05.07.10.06.40;	author bsiegert;	state dead;
branches;
next	1.1.2.2;
commitid	36QZAUeTkh8t2z7z;

1.1.2.2
date	2016.05.23.05.03.37;	author bsiegert;	state Exp;
branches;
next	;
commitid	36QZAUeTkh8t2z7z;


desc
@@


1.2
log
@rocs: update to 19.08.3    qt5/kf5 version
@
text
@$NetBSD: patch-RocsCore_DataStructures_Graph_GraphStructure.cpp,v 1.1 2016/05/07 10:06:40 joerg Exp $

Don't force the argument types for std::make_pair, GCC 4.8 has problems
figuring out the correct invocation.

--- RocsCore/DataStructures/Graph/GraphStructure.cpp.orig	2016-05-06 17:05:52.000000000 +0000
+++ RocsCore/DataStructures/Graph/GraphStructure.cpp
@@@@ -323,7 +323,7 @@@@ QMap<DataPtr,PointerList> Rocs::GraphStr
     counter = 0;
     foreach(PointerPtr p, pointerListAll) {
         edges[counter] = Edge(node_mapping[p->from()->identifier()], node_mapping[p->to()->identifier()]);
-        edge_mapping[std::make_pair < int, int > (node_mapping[p->from()->identifier()], node_mapping[p->to()->identifier()])] = p;
+        edge_mapping[std::make_pair(node_mapping[p->from()->identifier()], node_mapping[p->to()->identifier()])] = p;
         if (!p->property("value").toString().isEmpty()) {
             weights[counter] = p->property("value").toDouble();
         } else {
@@@@ -333,7 +333,7 @@@@ QMap<DataPtr,PointerList> Rocs::GraphStr
         // if graph is directed, also add back-edges
         if (p->direction() == PointerType::Bidirectional) {
             edges[counter] = Edge(node_mapping[p->to()->identifier()], node_mapping[p->from()->identifier()]);
-            edge_mapping[std::make_pair< int, int >(node_mapping[p->to()->identifier()], node_mapping[p->from()->identifier()])] = p;
+            edge_mapping[std::make_pair(node_mapping[p->to()->identifier()], node_mapping[p->from()->identifier()])] = p;
             if (!p->property("value").toString().isEmpty()) {
                 weights[counter] = p->property("value").toDouble();
             } else {
@


1.1
log
@With newer Boost, this now must be built as C++11. Unrestrict make_pair
to help GCC 4.8 figure out the right template of make_pair.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-RocsCore_DataStructures_Graph_GraphStructure.cpp was added on branch pkgsrc-2016Q1 on 2016-05-23 05:03:37 +0000
@
text
@d1 25
@


1.1.2.2
log
@Pullup ticket #4998 - requested by joerg
misc/rocs: build fix

Revisions pulled up:
- misc/rocs/Makefile                                            1.40
- misc/rocs/distinfo                                            1.12
- misc/rocs/patches/patch-RocsCore_DataStructures_Graph_GraphStructure.cpp 1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat May  7 10:06:40 UTC 2016

   Modified Files:
   	pkgsrc/misc/rocs: Makefile distinfo
   Added Files:
   	pkgsrc/misc/rocs/patches:
   	    patch-RocsCore_DataStructures_Graph_GraphStructure.cpp

   Log Message:
   With newer Boost, this now must be built as C++11. Unrestrict make_pair
   to help GCC 4.8 figure out the right template of make_pair.
@
text
@a0 25
$NetBSD$

Don't force the argument types for std::make_pair, GCC 4.8 has problems
figuring out the correct invocation.

--- RocsCore/DataStructures/Graph/GraphStructure.cpp.orig	2016-05-06 17:05:52.000000000 +0000
+++ RocsCore/DataStructures/Graph/GraphStructure.cpp
@@@@ -323,7 +323,7 @@@@ QMap<DataPtr,PointerList> Rocs::GraphStr
     counter = 0;
     foreach(PointerPtr p, pointerListAll) {
         edges[counter] = Edge(node_mapping[p->from()->identifier()], node_mapping[p->to()->identifier()]);
-        edge_mapping[std::make_pair < int, int > (node_mapping[p->from()->identifier()], node_mapping[p->to()->identifier()])] = p;
+        edge_mapping[std::make_pair(node_mapping[p->from()->identifier()], node_mapping[p->to()->identifier()])] = p;
         if (!p->property("value").toString().isEmpty()) {
             weights[counter] = p->property("value").toDouble();
         } else {
@@@@ -333,7 +333,7 @@@@ QMap<DataPtr,PointerList> Rocs::GraphStr
         // if graph is directed, also add back-edges
         if (p->direction() == PointerType::Bidirectional) {
             edges[counter] = Edge(node_mapping[p->to()->identifier()], node_mapping[p->from()->identifier()]);
-            edge_mapping[std::make_pair< int, int >(node_mapping[p->to()->identifier()], node_mapping[p->from()->identifier()])] = p;
+            edge_mapping[std::make_pair(node_mapping[p->to()->identifier()], node_mapping[p->from()->identifier()])] = p;
             if (!p->property("value").toString().isEmpty()) {
                 weights[counter] = p->property("value").toDouble();
             } else {
@