SCRIPT Run cc include replacements

wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp

@@ -13,11 +13,11 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/SafeThread.h"
-#include "wpi/UidVector.h"
-#include "wpi/condition_variable.h"
-#include "wpi/mutex.h"
-#include "wpi/raw_ostream.h"
+#include "wpi/util/SafeThread.hpp"
+#include "wpi/util/UidVector.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/EventVector.hpp

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "wpi/SmallVector.h"
-#include "wpi/Synchronization.h"
-#include "wpi/mutex.h"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/mutex.hpp"
 
 namespace wpi {
 struct EventVector {

wpiutil/src/main/native/include/wpi/util/MessagePack.hpp

@@ -10,7 +10,7 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/mpack.h"
+#include "wpi/util/mpack.h"
 
 namespace mpack {
 

wpiutil/src/main/native/include/wpi/util/RawFrame.h

@@ -17,7 +17,7 @@
 #endif
 
 #ifdef WPI_RAWFRAME_JNI
-#include "wpi/jni_util.h"
+#include "wpi/util/jni_util.hpp"
 #endif
 
 // NOLINT

wpiutil/src/main/native/include/wpi/util/RuntimeCheck.h

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "wpi/string.h"
+#include "wpi/util/string.h"
 
 #ifdef __cplusplus
 extern "C" {

wpiutil/src/main/native/include/wpi/util/SafeThread.hpp

@@ -10,9 +10,9 @@
 #include <thread>
 #include <utility>
 
-#include "wpi/Synchronization.h"
-#include "wpi/condition_variable.h"
-#include "wpi/mutex.h"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/condition_variable.hpp

@@ -6,7 +6,7 @@
 
 #include <condition_variable>
 
-#include "wpi/priority_mutex.h"
+#include "wpi/util/priority_mutex.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp

@@ -7,7 +7,7 @@
 
 #include <fmt/format.h>
 
-#include "wpi/raw_ostream.h"
+#include "wpi/util/raw_ostream.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/future.hpp

@@ -15,8 +15,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/condition_variable.h"
-#include "wpi/mutex.h"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/jni_util.hpp

@@ -15,15 +15,15 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/ConvertUTF.h"
-#include "wpi/SafeThread.h"
-#include "wpi/SmallString.h"
-#include "wpi/SmallVector.h"
-#include "wpi/StringExtras.h"
-#include "wpi/mutex.h"
-#include "wpi/print.h"
-#include "wpi/raw_ostream.h"
-#include "wpi/string.h"
+#include "wpi/util/ConvertUTF.hpp"
+#include "wpi/util/SafeThread.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/raw_ostream.hpp"
+#include "wpi/util/string.h"
 
 /** Java Native Interface (JNI) utility functions */
 namespace wpi::java {

wpiutil/src/main/native/include/wpi/util/mutex.hpp

@@ -6,7 +6,7 @@
 
 #include <mutex>
 
-#include "wpi/priority_mutex.h"
+#include "wpi/util/priority_mutex.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/protobuf/Protobuf.hpp

@@ -17,8 +17,8 @@
 #include "pb.h"
 #include "pb_decode.h"
 #include "pb_encode.h"
-#include "wpi/array.h"
-#include "wpi/function_ref.h"
+#include "wpi/util/array.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/protobuf/ProtobufCallbacks.hpp

@@ -11,9 +11,9 @@
 #include <fmt/format.h>
 
 #include "pb.h"
-#include "wpi/SmallVector.h"
-#include "wpi/array.h"
-#include "wpi/protobuf/Protobuf.h"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/array.hpp"
+#include "wpi/util/protobuf/Protobuf.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/raw_istream.hpp

@@ -15,7 +15,7 @@
 #include <system_error>
 #include <vector>
 
-#include "wpi/SmallVector.h"
+#include "wpi/util/SmallVector.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/sendable/Sendable.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "wpi/SymbolExports.h"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/sendable/SendableBuilder.hpp

@@ -11,7 +11,7 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/SmallVector.h"
+#include "wpi/util/SmallVector.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/sendable/SendableHelper.hpp

@@ -6,7 +6,7 @@
 
 #include <type_traits>
 
-#include "wpi/sendable/SendableRegistry.h"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/spinlock.hpp

@@ -9,7 +9,7 @@
 #include <mutex>
 #include <thread>
 
-#include "wpi/Compiler.h"
+#include "wpi/util/Compiler.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/struct/DynamicStruct.hpp

@@ -13,8 +13,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/StringMap.h"
-#include "wpi/bit.h"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/bit.hpp"
 
 namespace wpi {
 

wpiutil/src/main/native/include/wpi/util/struct/Struct.hpp

@@ -17,13 +17,13 @@
 
 #include <fmt/format.h>
 
-#include "wpi/Endian.h"
-#include "wpi/array.h"
-#include "wpi/bit.h"
-#include "wpi/ct_string.h"
-#include "wpi/function_ref.h"
-#include "wpi/mutex.h"
-#include "wpi/type_traits.h"
+#include "wpi/util/Endian.hpp"
+#include "wpi/util/array.hpp"
+#include "wpi/util/bit.hpp"
+#include "wpi/util/ct_string.hpp"
+#include "wpi/util/function_ref.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/type_traits.hpp"
 
 namespace wpi {