File fix-gcc6-c++14.patch of Package ARToolKitPlus

Overview Repositories Revisions Requests Users Attributes Meta

File fix-gcc6-c++14.patch of Package ARToolKitPlus (Revision 5671748ac5a82fe6d9700de4bf1902dc)

Currently displaying revision 5671748ac5a82fe6d9700de4bf1902dc , Show latest

diff -Nur ARToolKitPlus-2.1.1/src/core/rppMultiGetTransMat.cxx new/src/core/rppMultiGetTransMat.cxx
--- ARToolKitPlus-2.1.1/src/core/rppMultiGetTransMat.cxx	2006-04-19 23:28:10.000000000 +0200
+++ new/src/core/rppMultiGetTransMat.cxx	2016-06-26 17:11:30.539388003 +0200
@@ -64,14 +64,14 @@
 		if(m_patt_id >= 0)
 		{
 			std::map<int, int>::iterator iter = marker_id_freq.find(m_patt_id);
-			if(iter == marker_id_freq.end()) marker_id_freq.insert(std::make_pair<int,int>(m_patt_id,1));
+			if(iter == marker_id_freq.end()) marker_id_freq.insert(std::pair<int,int>(m_patt_id,1));
 			else ((*iter).second)++;
 		}
 	}
 
 	std::deque<std::pair<int,int> > config_patt_id;
 	for(int j=0; j<config->marker_num; j++)
-		config_patt_id.push_back(std::make_pair<int,int>(j, config->marker[j].patt_id));
+		config_patt_id.push_back(std::pair<int,int>(j, config->marker[j].patt_id));
 
 	std::map<int, int> m2c_idx;
 	for(int m=0; m<marker_num; m++)
@@ -88,7 +88,7 @@
 				const int patt_id = (*c_iter).second;
 				if(marker_info[m].id == patt_id)
 				{
-					m2c_idx.insert(std::make_pair<int,int>(m,(*c_iter).first));
+					m2c_idx.insert(std::pair<int,int>(m,(*c_iter).first));
 					config_patt_id.erase(c_iter);
 					c_iter = config_patt_id.end();
 					continue;

Places

File fix-gcc6-c++14.patch of Package ARToolKitPlus (Revision 5671748ac5a82fe6d9700de4bf1902dc)

Places