Просмотр исходного кода

Drop now-unused definition of CM_OVERRIDE

Brad King 8 лет назад
Родитель
Сommit
4e14498f4f
4 измененных файлов с 0 добавлено и 33 удалено
  1. 0 1
      Source/Checks/cm_cxx_features.cmake
  2. 0 24
      Source/Checks/cm_cxx_override.cxx
  3. 0 7
      Source/cmConfigure.cmake.h.in
  4. 0 1
      bootstrap

+ 0 - 1
Source/Checks/cm_cxx_features.cmake

@@ -51,5 +51,4 @@ cm_check_cxx_feature(make_unique)
 if(CMake_HAVE_CXX_MAKE_UNIQUE)
 if(CMake_HAVE_CXX_MAKE_UNIQUE)
   set(CMake_HAVE_CXX_UNIQUE_PTR 1)
   set(CMake_HAVE_CXX_UNIQUE_PTR 1)
 endif()
 endif()
-cm_check_cxx_feature(override)
 cm_check_cxx_feature(unique_ptr)
 cm_check_cxx_feature(unique_ptr)

+ 0 - 24
Source/Checks/cm_cxx_override.cxx

@@ -1,24 +0,0 @@
-struct Foo
-{
-  Foo() {}
-  virtual ~Foo() {}
-  virtual int test() const = 0;
-};
-
-struct Bar : Foo
-{
-  Bar() {}
-  ~Bar() override {}
-  int test() const override { return 0; }
-};
-
-int test(Foo const& foo)
-{
-  return foo.test();
-}
-
-int main()
-{
-  Bar const bar;
-  return test(bar);
-}

+ 0 - 7
Source/cmConfigure.cmake.h.in

@@ -25,7 +25,6 @@
 #cmakedefine CMake_HAVE_CXX_GNU_FALLTHROUGH
 #cmakedefine CMake_HAVE_CXX_GNU_FALLTHROUGH
 #cmakedefine CMake_HAVE_CXX_ATTRIBUTE_FALLTHROUGH
 #cmakedefine CMake_HAVE_CXX_ATTRIBUTE_FALLTHROUGH
 #cmakedefine CMake_HAVE_CXX_MAKE_UNIQUE
 #cmakedefine CMake_HAVE_CXX_MAKE_UNIQUE
-#cmakedefine CMake_HAVE_CXX_OVERRIDE
 #cmakedefine CMake_HAVE_CXX_UNIQUE_PTR
 #cmakedefine CMake_HAVE_CXX_UNIQUE_PTR
 #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@"
 #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@"
 #define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@"
 #define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@"
@@ -46,12 +45,6 @@
 #define CM_FALLTHROUGH
 #define CM_FALLTHROUGH
 #endif
 #endif
 
 
-#ifdef CMake_HAVE_CXX_OVERRIDE
-#define CM_OVERRIDE override
-#else
-#define CM_OVERRIDE
-#endif
-
 #define CM_DISABLE_COPY(Class)                                                \
 #define CM_DISABLE_COPY(Class)                                                \
   Class(Class const&) CM_EQ_DELETE;                                           \
   Class(Class const&) CM_EQ_DELETE;                                           \
   Class& operator=(Class const&) CM_EQ_DELETE;
   Class& operator=(Class const&) CM_EQ_DELETE;

+ 0 - 1
bootstrap

@@ -1207,7 +1207,6 @@ cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insal
 cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"
 cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"
 cmake_report cmConfigure.h${_tmp} "#define CM_EQ_DELETE"
 cmake_report cmConfigure.h${_tmp} "#define CM_EQ_DELETE"
 cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
 cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
-cmake_report cmConfigure.h${_tmp} "#define CM_OVERRIDE"
 cmake_report cmConfigure.h${_tmp} "#define CM_DISABLE_COPY(Class)"
 cmake_report cmConfigure.h${_tmp} "#define CM_DISABLE_COPY(Class)"
 
 
 # Regenerate configured headers
 # Regenerate configured headers