Commit 4f35a592 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #8912 from alalek:fix_cxx11_mac_flann

parents 9b902ade cc525233
...@@ -246,6 +246,12 @@ public: ...@@ -246,6 +246,12 @@ public:
return assign(x); 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. /// Assignment operator, specialed for literal strings.
/// They have types like const char [6] which don't work as expected. /// They have types like const char [6] which don't work as expected.
any& operator=(const char* x) any& operator=(const char* x)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment