Merge pull request #7039 from vpisarev:2_small_fixes

modules/ml/src/data.cpp

@@ -747,9 +747,6 @@ public:
                     }
                 }
                 while(*stopstring != ']');
-
-                if( stopstring[1] != '\0' && stopstring[1] != ',')
-                    CV_Error( CV_StsBadArg, errmsg );
             }
         }
 

modules/ts/include/opencv2/ts/ts_perf.hpp

@@ -371,8 +371,8 @@ public:
 
     class PerfSkipTestException: public cv::Exception
     {
-        int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty")
     public:
+        int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty")
         PerfSkipTestException() : dummy(0) {}
     };