[Earthmovdist-commits] r23 - pkg/src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2010-01-15 04:15:21 +0100 (Fri, 15 Jan 2010)
New Revision: 23

Modified:
   pkg/src/emdL1.h
Log:
make g++ -Wall happy by 
 - declaring function without return void, 
 - add #ifndef __GNUC__ around #pragma


Modified: pkg/src/emdL1.h
===================================================================
--- pkg/src/emdL1.h	2009-04-27 13:39:10 UTC (rev 22)
+++ pkg/src/emdL1.h	2010-01-15 03:15:21 UTC (rev 23)
@@ -67,7 +67,9 @@
 #ifndef	EMDL1_H_
 #define	EMDL1_H_
 
+#ifndef __GNUC__
 #pragma warning(disable:4786)
+#endif
 
 #include <vector>
 
@@ -128,7 +130,7 @@
 
 	EMDTYPE EmdDist(EMDTYPE *H1, EMDTYPE *H2, int n1, int n2, int n3=0);
 	EMDTYPE EmdDist(EMDTYPE *H1, EMDTYPE *H2, int n1);	// 1-D, special and simple case
-	int		SetMaxIteration(int nMaxIt)		{	m_nMaxIt=nMaxIt;	};
+	void	SetMaxIteration(int nMaxIt)		{	m_nMaxIt=nMaxIt;	};
 
 private: