From 0a6618705389543191a8c44278d4c6791c84602a Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Mon, 9 Apr 2018 11:54:39 -0700
Subject: Add lint checking for Objective-C++ sources (#1048)

* lint.sh now lints Objective-C++ too

* cpplint checks system-style includes that should be user-style

This prevents it from recognizing project sources as if they were C
system headers and then complaining that they're in the wrong place.

* cpplint checks #imports and #includes

* cpplint checks that C++ system headers aren't #imported

* cpplint checks for C system headers that could be C++ system headers

* cpplint checks that Objective-C sources include their headers
---
 Firestore/core/src/firebase/firestore/geo_point.cc                | 2 +-
 Firestore/core/src/firebase/firestore/immutable/sorted_map_base.h | 2 +-
 Firestore/core/src/firebase/firestore/immutable/tree_sorted_map.h | 3 +--
 .../core/src/firebase/firestore/local/leveldb_transaction.cc      | 3 +--
 Firestore/core/src/firebase/firestore/local/leveldb_transaction.h | 8 ++++----
 Firestore/core/src/firebase/firestore/model/database_id.h         | 3 +--
 Firestore/core/src/firebase/firestore/model/field_value.cc        | 3 +--
 Firestore/core/src/firebase/firestore/model/field_value.h         | 3 +--
 Firestore/core/src/firebase/firestore/model/types.h               | 2 +-
 Firestore/core/src/firebase/firestore/remote/serializer.h         | 4 ++--
 Firestore/core/src/firebase/firestore/util/assert_apple.mm        | 6 ++----
 Firestore/core/src/firebase/firestore/util/assert_stdio.cc        | 3 +--
 Firestore/core/src/firebase/firestore/util/bits.h                 | 2 +-
 Firestore/core/src/firebase/firestore/util/comparison.cc          | 3 +--
 Firestore/core/src/firebase/firestore/util/comparison.h           | 2 +-
 Firestore/core/src/firebase/firestore/util/firebase_assert.h      | 2 +-
 Firestore/core/src/firebase/firestore/util/log.h                  | 2 +-
 Firestore/core/src/firebase/firestore/util/log_stdio.cc           | 2 +-
 Firestore/core/src/firebase/firestore/util/ordered_code.cc        | 7 +++----
 Firestore/core/src/firebase/firestore/util/secure_random.h        | 2 +-
 .../core/src/firebase/firestore/util/secure_random_arc4random.cc  | 2 +-
 .../core/src/firebase/firestore/util/secure_random_openssl.cc     | 4 ++--
 Firestore/core/src/firebase/firestore/util/string_printf.cc       | 2 +-
 Firestore/core/src/firebase/firestore/util/string_printf.h        | 3 +--
 24 files changed, 32 insertions(+), 43 deletions(-)

(limited to 'Firestore/core/src/firebase')

diff --git a/Firestore/core/src/firebase/firestore/geo_point.cc b/Firestore/core/src/firebase/firestore/geo_point.cc
index fb01023..2f35390 100644
--- a/Firestore/core/src/firebase/firestore/geo_point.cc
+++ b/Firestore/core/src/firebase/firestore/geo_point.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/include/firebase/firestore/geo_point.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
 
diff --git a/Firestore/core/src/firebase/firestore/immutable/sorted_map_base.h b/Firestore/core/src/firebase/firestore/immutable/sorted_map_base.h
index accb5ef..cfb19c1 100644
--- a/Firestore/core/src/firebase/firestore/immutable/sorted_map_base.h
+++ b/Firestore/core/src/firebase/firestore/immutable/sorted_map_base.h
@@ -17,7 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_IMMUTABLE_SORTED_MAP_BASE_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_IMMUTABLE_SORTED_MAP_BASE_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/firebase/firestore/immutable/tree_sorted_map.h b/Firestore/core/src/firebase/firestore/immutable/tree_sorted_map.h
index e3102e7..dfe270d 100644
--- a/Firestore/core/src/firebase/firestore/immutable/tree_sorted_map.h
+++ b/Firestore/core/src/firebase/firestore/immutable/tree_sorted_map.h
@@ -17,9 +17,8 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_IMMUTABLE_TREE_SORTED_MAP_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_IMMUTABLE_TREE_SORTED_MAP_H_
 
-#include <assert.h>
-
 #include <algorithm>
+#include <cassert>
 #include <functional>
 #include <memory>
 #include <utility>
diff --git a/Firestore/core/src/firebase/firestore/local/leveldb_transaction.cc b/Firestore/core/src/firebase/firestore/local/leveldb_transaction.cc
index d84d441..f998550 100644
--- a/Firestore/core/src/firebase/firestore/local/leveldb_transaction.cc
+++ b/Firestore/core/src/firebase/firestore/local/leveldb_transaction.cc
@@ -16,12 +16,11 @@
 
 #include "Firestore/core/src/firebase/firestore/local/leveldb_transaction.h"
 
-#include <leveldb/write_batch.h>
-
 #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h"
 #include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
 #include "Firestore/core/src/firebase/firestore/util/log.h"
 #include "absl/memory/memory.h"
+#include "leveldb/write_batch.h"
 
 using leveldb::DB;
 using leveldb::ReadOptions;
diff --git a/Firestore/core/src/firebase/firestore/local/leveldb_transaction.h b/Firestore/core/src/firebase/firestore/local/leveldb_transaction.h
index 56a9a77..a6ddce2 100644
--- a/Firestore/core/src/firebase/firestore/local/leveldb_transaction.h
+++ b/Firestore/core/src/firebase/firestore/local/leveldb_transaction.h
@@ -17,16 +17,16 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_LOCAL_LEVELDB_TRANSACTION_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_LOCAL_LEVELDB_TRANSACTION_H_
 
-#include <absl/strings/string_view.h>
-#include <leveldb/db.h>
-
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 
+#include "absl/strings/string_view.h"
+#include "leveldb/db.h"
+
 #if __OBJC__
 #import <Protobuf/GPBProtocolBuffers.h>
 #endif
diff --git a/Firestore/core/src/firebase/firestore/model/database_id.h b/Firestore/core/src/firebase/firestore/model/database_id.h
index 2ad1332..e1feca9 100644
--- a/Firestore/core/src/firebase/firestore/model/database_id.h
+++ b/Firestore/core/src/firebase/firestore/model/database_id.h
@@ -17,8 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_DATABASE_ID_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_DATABASE_ID_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
 #include "absl/strings/string_view.h"
diff --git a/Firestore/core/src/firebase/firestore/model/field_value.cc b/Firestore/core/src/firebase/firestore/model/field_value.cc
index 2c1af53..1a40331 100644
--- a/Firestore/core/src/firebase/firestore/model/field_value.cc
+++ b/Firestore/core/src/firebase/firestore/model/field_value.cc
@@ -16,9 +16,8 @@
 
 #include "Firestore/core/src/firebase/firestore/model/field_value.h"
 
-#include <math.h>
-
 #include <algorithm>
+#include <cmath>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/Firestore/core/src/firebase/firestore/model/field_value.h b/Firestore/core/src/firebase/firestore/model/field_value.h
index c42d533..c70e332 100644
--- a/Firestore/core/src/firebase/firestore/model/field_value.h
+++ b/Firestore/core/src/firebase/firestore/model/field_value.h
@@ -17,8 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_FIELD_VALUE_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_FIELD_VALUE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/Firestore/core/src/firebase/firestore/model/types.h b/Firestore/core/src/firebase/firestore/model/types.h
index fc1b196..3f813be 100644
--- a/Firestore/core/src/firebase/firestore/model/types.h
+++ b/Firestore/core/src/firebase/firestore/model/types.h
@@ -17,7 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_TYPES_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_TYPES_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/firebase/firestore/remote/serializer.h b/Firestore/core/src/firebase/firestore/remote/serializer.h
index 454c3ad..3b2b667 100644
--- a/Firestore/core/src/firebase/firestore/remote/serializer.h
+++ b/Firestore/core/src/firebase/firestore/remote/serializer.h
@@ -17,8 +17,8 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_REMOTE_SERIALIZER_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_REMOTE_SERIALIZER_H_
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 #include <vector>
 
 #include "Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h"
diff --git a/Firestore/core/src/firebase/firestore/util/assert_apple.mm b/Firestore/core/src/firebase/firestore/util/assert_apple.mm
index 83b76e1..9b6a651 100644
--- a/Firestore/core/src/firebase/firestore/util/assert_apple.mm
+++ b/Firestore/core/src/firebase/firestore/util/assert_apple.mm
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
-
 #import <Foundation/Foundation.h>
 
-#include <string.h>
-
+// TODO(wilhuff): match basenames so this can move up top
+#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
 
 namespace firebase {
diff --git a/Firestore/core/src/firebase/firestore/util/assert_stdio.cc b/Firestore/core/src/firebase/firestore/util/assert_stdio.cc
index 1d2e333..e01e564 100644
--- a/Firestore/core/src/firebase/firestore/util/assert_stdio.cc
+++ b/Firestore/core/src/firebase/firestore/util/assert_stdio.cc
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#include <stdarg.h>
-
+#include <cstdarg>
 #include <stdexcept>
 #include <string>
 
diff --git a/Firestore/core/src/firebase/firestore/util/bits.h b/Firestore/core/src/firebase/firestore/util/bits.h
index 185273f..fec1228 100644
--- a/Firestore/core/src/firebase/firestore/util/bits.h
+++ b/Firestore/core/src/firebase/firestore/util/bits.h
@@ -22,7 +22,7 @@
 // Munging bits in _signed_ integers is fraught with peril! For example,
 // -5 << n has undefined behavior (for some values of n).
 
-#include <stdint.h>
+#include <cstdint>
 
 class Bits_Port32_Test;
 class Bits_Port64_Test;
diff --git a/Firestore/core/src/firebase/firestore/util/comparison.cc b/Firestore/core/src/firebase/firestore/util/comparison.cc
index 4bef843..bde7f84 100644
--- a/Firestore/core/src/firebase/firestore/util/comparison.cc
+++ b/Firestore/core/src/firebase/firestore/util/comparison.cc
@@ -16,8 +16,7 @@
 
 #include "Firestore/core/src/firebase/firestore/util/comparison.h"
 
-#include <math.h>
-
+#include <cmath>
 #include <limits>
 
 namespace firebase {
diff --git a/Firestore/core/src/firebase/firestore/util/comparison.h b/Firestore/core/src/firebase/firestore/util/comparison.h
index 6fd1e2b..23207f5 100644
--- a/Firestore/core/src/firebase/firestore/util/comparison.h
+++ b/Firestore/core/src/firebase/firestore/util/comparison.h
@@ -21,9 +21,9 @@
 #import <Foundation/Foundation.h>
 #endif
 
-#include <stdint.h>
 #include <sys/types.h>
 
+#include <cstdint>
 #include <functional>
 #include <string>
 #include <vector>
diff --git a/Firestore/core/src/firebase/firestore/util/firebase_assert.h b/Firestore/core/src/firebase/firestore/util/firebase_assert.h
index 6bc0dee..7de1dda 100644
--- a/Firestore/core/src/firebase/firestore/util/firebase_assert.h
+++ b/Firestore/core/src/firebase/firestore/util/firebase_assert.h
@@ -20,7 +20,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_FIREBASE_ASSERT_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_FIREBASE_ASSERT_H_
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "Firestore/core/src/firebase/firestore/util/log.h"
 #include "absl/base/attributes.h"
diff --git a/Firestore/core/src/firebase/firestore/util/log.h b/Firestore/core/src/firebase/firestore/util/log.h
index d0cff4d..1944596 100644
--- a/Firestore/core/src/firebase/firestore/util/log.h
+++ b/Firestore/core/src/firebase/firestore/util/log.h
@@ -17,7 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_LOG_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_LOG_H_
 
-#include <stdarg.h>
+#include <cstdarg>
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/firebase/firestore/util/log_stdio.cc b/Firestore/core/src/firebase/firestore/util/log_stdio.cc
index bca2dc9..b277406 100644
--- a/Firestore/core/src/firebase/firestore/util/log_stdio.cc
+++ b/Firestore/core/src/firebase/firestore/util/log_stdio.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/firebase/firestore/util/log.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 namespace firebase {
diff --git a/Firestore/core/src/firebase/firestore/util/ordered_code.cc b/Firestore/core/src/firebase/firestore/util/ordered_code.cc
index 0eadf18..cb53b09 100644
--- a/Firestore/core/src/firebase/firestore/util/ordered_code.cc
+++ b/Firestore/core/src/firebase/firestore/util/ordered_code.cc
@@ -16,12 +16,11 @@
 
 #include "Firestore/core/src/firebase/firestore/util/ordered_code.h"
 
-#include <absl/base/internal/endian.h>
-#include <absl/base/internal/unaligned_access.h>
-#include <absl/base/port.h>
-
 #include "Firestore/core/src/firebase/firestore/util/bits.h"
 #include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
+#include "absl/base/internal/endian.h"
+#include "absl/base/internal/unaligned_access.h"
+#include "absl/base/port.h"
 
 #define UNALIGNED_LOAD32 ABSL_INTERNAL_UNALIGNED_LOAD32
 #define UNALIGNED_LOAD64 ABSL_INTERNAL_UNALIGNED_LOAD64
diff --git a/Firestore/core/src/firebase/firestore/util/secure_random.h b/Firestore/core/src/firebase/firestore/util/secure_random.h
index 95b41e1..f030b5e 100644
--- a/Firestore/core/src/firebase/firestore/util/secure_random.h
+++ b/Firestore/core/src/firebase/firestore/util/secure_random.h
@@ -17,7 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_SECURE_RANDOM_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_SECURE_RANDOM_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <limits>
 
diff --git a/Firestore/core/src/firebase/firestore/util/secure_random_arc4random.cc b/Firestore/core/src/firebase/firestore/util/secure_random_arc4random.cc
index 83f72b5..d7e9be3 100644
--- a/Firestore/core/src/firebase/firestore/util/secure_random_arc4random.cc
+++ b/Firestore/core/src/firebase/firestore/util/secure_random_arc4random.cc
@@ -20,7 +20,7 @@
 
 #if HAVE_ARC4RANDOM
 
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/firebase/firestore/util/secure_random_openssl.cc b/Firestore/core/src/firebase/firestore/util/secure_random_openssl.cc
index d3f6e63..e024846 100644
--- a/Firestore/core/src/firebase/firestore/util/secure_random_openssl.cc
+++ b/Firestore/core/src/firebase/firestore/util/secure_random_openssl.cc
@@ -20,8 +20,8 @@
 
 #if HAVE_OPENSSL_RAND_H
 
-#include <openssl/err.h>
-#include <openssl/rand.h>
+#include "openssl/err.h"
+#include "openssl/rand.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/firebase/firestore/util/string_printf.cc b/Firestore/core/src/firebase/firestore/util/string_printf.cc
index 9c4e31c..c5483f4 100644
--- a/Firestore/core/src/firebase/firestore/util/string_printf.cc
+++ b/Firestore/core/src/firebase/firestore/util/string_printf.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/firebase/firestore/util/string_printf.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/firebase/firestore/util/string_printf.h b/Firestore/core/src/firebase/firestore/util/string_printf.h
index 10dfae9..553af66 100644
--- a/Firestore/core/src/firebase/firestore/util/string_printf.h
+++ b/Firestore/core/src/firebase/firestore/util/string_printf.h
@@ -17,8 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_STRING_PRINTF_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_STRING_PRINTF_H_
 
-#include <stdarg.h>
-
+#include <cstdarg>
 #include <string>
 
 #include "absl/base/attributes.h"
-- 
cgit v1.2.3