remove cpplint check of unapproved header

YinshiSanchez · Jun 2, 2024 · a6ecc72 · a6ecc72
1 parent 18ed4fe
commit a6ecc72
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/build_support/cpplint.py b/build_support/cpplint.py
@@ -6125,19 +6125,19 @@ def FlagCxx11Features(filename, clean_lines, linenum, error):
           ('C++ TR1 headers such as <%s> are unapproved.') % include.group(1))
 
   # Flag unapproved C++11 headers.
-  if include and include.group(1) in ('cfenv',
-                                      'condition_variable',
-                                      'fenv.h',
-                                      'future',
-                                      'mutex',
-                                      'thread',
-                                      'chrono',
-                                      'ratio',
-                                      'regex',
-                                      'system_error',
-                                     ):
-    error(filename, linenum, 'build/c++11', 5,
-          ('<%s> is an unapproved C++11 header.') % include.group(1))
+  # if include and include.group(1) in ('cfenv',
+  #                                     'condition_variable',
+  #                                     'fenv.h',
+  #                                     'future',
+  #                                     'mutex',
+  #                                     'thread',
+  #                                     'chrono',
+  #                                     'ratio',
+  #                                     'regex',
+  #                                     'system_error',
+  #                                    ):
+  #   error(filename, linenum, 'build/c++11', 5,
+  #         ('<%s> is an unapproved C++11 header.') % include.group(1))
 
   # The only place where we need to worry about C++11 keywords and library
   # features in preprocessor directives is in macro definitions.

diff --git a/src/include/storage/disk/disk_scheduler.h b/src/include/storage/disk/disk_scheduler.h
@@ -23,6 +23,7 @@
 #include <thread>  // NOLINT
 #include <type_traits>
 #include <utility>
+#include <vector>
 
 #include "common/channel.h"
 #include "storage/disk/disk_manager.h"

diff --git a/src/storage/disk/disk_manager_memory.cpp b/src/storage/disk/disk_manager_memory.cpp
@@ -47,4 +47,4 @@ void DiskManagerMemory::ReadPage(page_id_t page_id, char *page_data) {
   memcpy(page_data, memory_ + offset, BUSTUB_PAGE_SIZE);
 }
 
-}  // namespace bustub
+}  // namespace bustub