New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sign() macro redefinition compile-time error #680

Merged
merged 1 commit into from May 23, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+2 −2
Diff settings

Always

Just for now

Fix sign() macro redefinition compile-time error

  • Loading branch information...
Algomorph committed May 23, 2016
commit 395db9e7211d58473beafa6a9643d3cd49ad4eb4
@@ -54,8 +54,6 @@ namespace cv
//TODO based on the original implementation
//http://vision.ucsd.edu/~bbabenko/project_miltrack.shtml

#define sign(s) ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))

class ClfOnlineStump;

class CV_EXPORTS ClfMilBoost
@@ -42,6 +42,8 @@
#include "precomp.hpp"
#include "opencv2/tracking/onlineMIL.hpp"

#define sign(s) ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))

template<class T> class SortableElementRev
{
public:
ProTip! Use n and p to navigate between commits in a pull request.