Merge pull request #8912 from alalek:fix_cxx11_mac_flann

pull/8835/merge
Alexander Alekhin 8 years ago
commit 4f35a592a1
  1. 6
      modules/flann/include/opencv2/flann/any.h

@ -246,6 +246,12 @@ public:
return assign(x);
}
/// Assignment operator. Template-based version above doesn't work as expected. We need regular assignment operator here.
any& operator=(const any& x)
{
return assign(x);
}
/// Assignment operator, specialed for literal strings.
/// They have types like const char [6] which don't work as expected.
any& operator=(const char* x)

Loading…
Cancel
Save