fix up the includes to c variants in c++ code

AustinBenoit · AustinBenoit · commit 350df7d02938 · 2026-06-15T09:56:06.000-04:00
diff --git a/app/rest/request_json.h b/app/rest/request_json.h
@@ -17,8 +17,7 @@
 #ifndef FIREBASE_APP_REST_REQUEST_JSON_H_
 #define FIREBASE_APP_REST_REQUEST_JSON_H_
 
-#include <assert.h>
-
+#include <cassert>
 #include <string>
 
 #include "app/rest/request.h"
diff --git a/app/rest/response_json.h b/app/rest/response_json.h
@@ -17,9 +17,8 @@
 #ifndef FIREBASE_APP_REST_RESPONSE_JSON_H_
 #define FIREBASE_APP_REST_RESPONSE_JSON_H_
 
-#include <assert.h>
-#include <string.h>
-
+#include <cassert>
+#include <cstring>
 #include <string>
 #include <utility>
 
diff --git a/app/src/pthread_condvar.h b/app/src/pthread_condvar.h
@@ -17,15 +17,16 @@
 #ifndef FIREBASE_APP_SRC_PTHREAD_CONDVAR_H_
 #define FIREBASE_APP_SRC_PTHREAD_CONDVAR_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "app/src/include/firebase/internal/platform.h"
 
 #if !FIREBASE_PLATFORM_WINDOWS
 
-#include <errno.h>
 #include <pthread.h>
 
+#include <cerrno>
+
 #include "app/src/time.h"
 
 namespace firebase {
diff --git a/app/src/reference_counted_future_impl.h b/app/src/reference_counted_future_impl.h
@@ -17,8 +17,7 @@
 #ifndef FIREBASE_APP_SRC_REFERENCE_COUNTED_FUTURE_IMPL_H_
 #define FIREBASE_APP_SRC_REFERENCE_COUNTED_FUTURE_IMPL_H_
 
-#include <assert.h>
-
+#include <cassert>
 #include <functional>
 #include <map>
 #include <vector>
diff --git a/app/src/scheduler.h b/app/src/scheduler.h
@@ -17,8 +17,7 @@
 #ifndef FIREBASE_APP_SRC_SCHEDULER_H_
 #define FIREBASE_APP_SRC_SCHEDULER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <memory>
 #include <queue>
 
diff --git a/app/src/secure/user_secure_manager.h b/app/src/secure/user_secure_manager.h
@@ -15,8 +15,7 @@
 #ifndef FIREBASE_APP_SRC_SECURE_USER_SECURE_MANAGER_H_
 #define FIREBASE_APP_SRC_SECURE_USER_SECURE_MANAGER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/app/src/semaphore.h b/app/src/semaphore.h
@@ -17,8 +17,8 @@
 #ifndef FIREBASE_APP_SRC_SEMAPHORE_H_
 #define FIREBASE_APP_SRC_SEMAPHORE_H_
 
-#include <errno.h>
-#include <stdint.h>
+#include <cerrno>
+#include <cstdint>
 
 #include "app/src/assert.h"
 #include "app/src/include/firebase/internal/platform.h"
diff --git a/app/src/util_android.h b/app/src/util_android.h
@@ -17,11 +17,11 @@
 #ifndef FIREBASE_APP_SRC_UTIL_ANDROID_H_
 #define FIREBASE_APP_SRC_UTIL_ANDROID_H_
 
-#include <assert.h>
 #include <jni.h>
-#include <stddef.h>
-#include <stdint.h>
 
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
 #include <map>
 #include <string>
 #include <unordered_set>
@@ -193,7 +193,7 @@ bool LookupFieldIds(JNIEnv* env, jclass clazz,
 
 // Used to populate an array of MethodNameSignature.
 #define METHOD_NAME_SIGNATURE_5(id, name, signature, method_type, optional) \
-  { name, signature, method_type, optional }
+  {name, signature, method_type, optional}
 #define METHOD_NAME_SIGNATURE_4(id, name, signature, method_type) \
   METHOD_NAME_SIGNATURE_5(                                        \
       id, name, signature, method_type,                           \
diff --git a/app_check/src/include/firebase/app_check.h b/app_check/src/include/firebase/app_check.h
@@ -15,8 +15,7 @@
 #ifndef FIREBASE_APP_CHECK_SRC_INCLUDE_FIREBASE_APP_CHECK_H_
 #define FIREBASE_APP_CHECK_SRC_INCLUDE_FIREBASE_APP_CHECK_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
 #include "firebase/app.h"
diff --git a/auth/src/desktop/auth_desktop.h b/auth/src/desktop/auth_desktop.h
@@ -15,8 +15,7 @@
 #ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_DESKTOP_H_
 #define FIREBASE_AUTH_SRC_DESKTOP_AUTH_DESKTOP_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/auth/src/desktop/auth_util.h b/auth/src/desktop/auth_util.h
@@ -15,8 +15,7 @@
 #ifndef FIREBASE_AUTH_SRC_DESKTOP_AUTH_UTIL_H_
 #define FIREBASE_AUTH_SRC_DESKTOP_AUTH_UTIL_H_
 
-#include <assert.h>
-
+#include <cassert>
 #include <memory>
 #include <vector>
 
diff --git a/auth/src/desktop/validate_credential.h b/auth/src/desktop/validate_credential.h
@@ -15,8 +15,7 @@
 #ifndef FIREBASE_AUTH_SRC_DESKTOP_VALIDATE_CREDENTIAL_H_
 #define FIREBASE_AUTH_SRC_DESKTOP_VALIDATE_CREDENTIAL_H_
 
-#include <string.h>
-
+#include <cstring>
 #include <string>
 
 #include "auth/src/desktop/auth_constants.h"
diff --git a/auth/src/include/firebase/auth.h b/auth/src/include/firebase/auth.h
@@ -17,8 +17,7 @@
 #ifndef FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_H_
 #define FIREBASE_AUTH_SRC_INCLUDE_FIREBASE_AUTH_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/database/src/desktop/connection/connection.h b/database/src/desktop/connection/connection.h
@@ -15,9 +15,8 @@
 #ifndef FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_CONNECTION_H_
 #define FIREBASE_DATABASE_SRC_DESKTOP_CONNECTION_CONNECTION_H_
 
-#include <stdint.h>
-
 #include <atomic>
+#include <cstdint>
 #include <memory>
 #include <sstream>
 
diff --git a/database/src/desktop/core/operation.h b/database/src/desktop/core/operation.h
@@ -15,7 +15,7 @@
 #ifndef FIREBASE_DATABASE_SRC_DESKTOP_CORE_OPERATION_H_
 #define FIREBASE_DATABASE_SRC_DESKTOP_CORE_OPERATION_H_
 
-#include <assert.h>
+#include <cassert>
 
 #include "app/src/assert.h"
 #include "app/src/optional.h"
diff --git a/firestore/src/android/field_path_portable.h b/firestore/src/android/field_path_portable.h
@@ -17,7 +17,7 @@
 #ifndef FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_PATH_PORTABLE_H_
 #define FIREBASE_FIRESTORE_SRC_ANDROID_FIELD_PATH_PORTABLE_H_
 
-#include <assert.h>
+#include <cassert>
 #include <string>
 #include <vector>
 
diff --git a/firestore/src/jni/traits.h b/firestore/src/jni/traits.h
@@ -18,7 +18,7 @@
 #define FIREBASE_FIRESTORE_SRC_JNI_TRAITS_H_
 
 #include <jni.h>
-#include <stdint.h>
+#include <cstdint>
 
 #include <cstddef>
 
diff --git a/firestore/src/main/field_value_main.h b/firestore/src/main/field_value_main.h
@@ -17,7 +17,7 @@
 #ifndef FIREBASE_FIRESTORE_SRC_MAIN_FIELD_VALUE_MAIN_H_
 #define FIREBASE_FIRESTORE_SRC_MAIN_FIELD_VALUE_MAIN_H_
 
-#include <assert.h>
+#include <cassert>
 #include <cstdint>
 #include <string>
 #include <utility>
diff --git a/storage/src/include/firebase/storage/controller.h b/storage/src/include/firebase/storage/controller.h
@@ -15,7 +15,7 @@
 #ifndef FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_CONTROLLER_H_
 #define FIREBASE_STORAGE_SRC_INCLUDE_FIREBASE_STORAGE_CONTROLLER_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "firebase/storage/storage_reference.h"
 
