next: drop DISABLE_OPENCV_24_COMPATIBILITY

modules/core/include/opencv2/core/cvdef.h

@@ -254,7 +254,7 @@ Cv64suf;
 #define OPENCV_ABI_COMPATIBILITY 400
 
 #ifdef __OPENCV_BUILD
-#  define DISABLE_OPENCV_24_COMPATIBILITY
+#  define DISABLE_OPENCV_3_COMPATIBILITY
 #endif
 
 #ifdef CVAPI_EXPORTS

modules/core/include/opencv2/core/cvstd.hpp

@@ -281,10 +281,7 @@ struct Ptr
     @note It is often easier to use makePtr instead.
      */
     template<typename Y>
-#ifdef DISABLE_OPENCV_24_COMPATIBILITY
-    explicit
-#endif
-    Ptr(Y* p);
+    explicit Ptr(Y* p);
 
     /** @overload
     @param d Deleter to use for the owned pointer.

modules/core/include/opencv2/core/utility.hpp

@@ -1244,8 +1244,4 @@ CV_EXPORTS int getThreadID();
 
 } //namespace cv
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/core/core_c.h"
-#endif
-
 #endif //OPENCV_CORE_UTILITY_H