head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.1.0.2
	pkgsrc-2013Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2013.04.03.10.52.25;	author markd;	state dead;
branches;
next	1.1;

1.1
date	2013.02.26.23.37.32;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications
@
text
@$NetBSD: patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp,v 1.1 2013/02/26 23:37:32 joerg Exp $

--- src/Plugins/DataStructure/Graph/GraphStructure.cpp.orig	2013-02-26 22:55:07.000000000 +0000
+++ src/Plugins/DataStructure/Graph/GraphStructure.cpp
@@@@ -153,7 +153,7 @@@@ QScriptValue Rocs::GraphStructure::dijks
     BOOST_FOREACH( PointerPtr p, this->pointers() )
     {
          edges[counter] = Edge(node_mapping[p->from().get()], node_mapping[p->to().get()]);
-         edge_mapping[std::make_pair<int,int>(node_mapping[p->from().get()], node_mapping[p->to().get()])] = p;
+         edge_mapping[std::make_pair(node_mapping[p->from().get()], node_mapping[p->to().get()])] = p;
          if (!p->value().isEmpty()) {
               weights[counter] = p->value().toDouble();
          } else {
@@@@ -163,7 +163,7 @@@@ QScriptValue Rocs::GraphStructure::dijks
          // if graph is directed, also add back-edges
          if(!this->directed()) {
               edges[counter] = Edge(node_mapping[p->to().get()], node_mapping[p->from().get()]);
-              edge_mapping[std::make_pair<int,int>(node_mapping[p->to().get()], node_mapping[p->from().get()])] = p;
+              edge_mapping[std::make_pair(node_mapping[p->to().get()], node_mapping[p->from().get()])] = p;
               if (!p->value().isEmpty()) {
                     weights[counter] = p->value().toDouble();
               } else {
@


1.1
log
@Require C++11 when building with Clang. Fix fallout of Boost update due
to MOC's limited C preprocessor. Derive template arguments of make_pair
automatically.
@
text
@d1 1
a1 1
$NetBSD$
@