Fix base/macros include order

Author: jmr

src/s2/mutable_s2shape_index.h

@@ -27,9 +27,9 @@
 
 #include "s2/third_party/absl/base/integral_types.h"
 #include "s2/base/logging.h"
-#include "s2/third_party/absl/base/macros.h"
 #include "s2/base/spinlock.h"
 #include "s2/third_party/absl/base/thread_annotations.h"
+#include "s2/third_party/absl/base/macros.h"
 #include "s2/util/gtl/btree_map.h"
 #include "s2/third_party/absl/memory/memory.h"
 #include "s2/base/mutex.h"

src/s2/s2cell_id_test.cc

@@ -26,8 +26,8 @@
 #include <vector>
 
 #include "s2/base/logging.h"
-#include "s2/third_party/absl/base/macros.h"
 #include <gtest/gtest.h>
+#include "s2/third_party/absl/base/macros.h"
 #include "s2/r2.h"
 #include "s2/r2rect.h"
 #include "s2/s2cap.h"

src/s2/s2cell_test.cc

@@ -26,8 +26,8 @@
 #include <vector>
 
 #include "s2/base/logging.h"
-#include "s2/third_party/absl/base/macros.h"
 #include <gtest/gtest.h>
+#include "s2/third_party/absl/base/macros.h"
 #include "s2/third_party/absl/memory/memory.h"
 #include "s2/third_party/absl/strings/str_cat.h"
 #include "s2/mutable_s2shape_index.h"

src/s2/s2point_compression.cc

@@ -21,8 +21,8 @@
 
 #include "s2/third_party/absl/base/integral_types.h"
 #include "s2/base/logging.h"
-#include "s2/third_party/absl/base/macros.h"
 #include "s2/third_party/absl/base/casts.h"
+#include "s2/third_party/absl/base/macros.h"
 #include "s2/third_party/absl/container/fixed_array.h"
 #include "s2/third_party/absl/types/span.h"
 #include "s2/util/bits/bit-interleave.h"

src/s2/s2polygon.h

@@ -25,7 +25,6 @@
 
 #include "s2/third_party/absl/base/integral_types.h"
 #include "s2/third_party/absl/base/macros.h"
-#include "s2/third_party/absl/base/macros.h"
 #include "s2/_fp_contract_off.h"
 #include "s2/mutable_s2shape_index.h"
 #include "s2/s1angle.h"

src/s2/s2polygon_test.cc

@@ -31,9 +31,9 @@
 #include "s2/base/casts.h"
 #include "s2/base/commandlineflags.h"
 #include "s2/base/logging.h"
-#include "s2/third_party/absl/base/macros.h"
 #include "s2/strings/serialize.h"
 #include <gtest/gtest.h>
+#include "s2/third_party/absl/base/macros.h"
 #include "s2/third_party/absl/container/fixed_array.h"
 #include "s2/third_party/absl/memory/memory.h"
 #include "s2/third_party/absl/strings/str_cat.h"

src/s2/s2shape_index.h

@@ -32,10 +32,10 @@
 
 #include "s2/third_party/absl/base/integral_types.h"
 #include "s2/base/logging.h"
-#include "s2/third_party/absl/base/macros.h"
 #include "s2/base/mutex.h"
 #include "s2/base/spinlock.h"
 #include "s2/third_party/absl/base/thread_annotations.h"
+#include "s2/third_party/absl/base/macros.h"
 #include "s2/third_party/absl/memory/memory.h"
 #include "s2/_fp_contract_off.h"
 #include "s2/s2cell_id.h"