Clang-Tidy 17: misc-use-anonymous-namespace

Src/Amr/AMReX_AmrLevel.cpp

@@ -726,12 +726,13 @@ FillPatchIterator::FillPatchIterator (AmrLevel& amrlevel,
 #endif
 }
 
-static
+namespace {
 bool
 NeedToTouchUpPhysCorners (const Geometry& geom)
 {
     return geom.isAnyPeriodic() && !geom.isAllPeriodic();
 }
+}
 
 void
 FillPatchIteratorHelper::Initialize (int           boxGrow,
@@ -1154,7 +1155,8 @@ FillPatchIterator::FillFromTwoLevels (Real time, int idx, int scomp, int dcomp,
                               desc.getBCs(),scomp);
 }
 
-static
+namespace {
+
 bool
 HasPhysBndry (const Box&      b,
               const Box&      dmn,
@@ -1174,7 +1176,6 @@ HasPhysBndry (const Box&      b,
     return false;
 }
 
-static
 void
 FixUpPhysCorners (FArrayBox&      fab,
                   AmrLevel&       TheLevel,
@@ -1258,6 +1259,8 @@ FixUpPhysCorners (FArrayBox&      fab,
     }
 }
 
+}
+
 void
 FillPatchIteratorHelper::fill (FArrayBox& fab,
                                int        dcomp,

Src/AmrCore/AMReX_Cluster.cpp

@@ -148,7 +148,8 @@ Cluster::minBox () noexcept
 // Finds best cut location in histogram.
 //
 
-static
+namespace {
+
 int
 FindCut (const int* hist,
          int        lo,
@@ -236,7 +237,6 @@ FindCut (const int* hist,
     return lo + cutpoint;
 }
 
-namespace {
 //
 // Predicate in call to std::partition() in Cluster::chop().
 //

Src/AmrCore/AMReX_ErrorList.cpp

@@ -194,7 +194,9 @@ ErrorList::operator[] (int k) const noexcept
     return *vec[k];
 }
 
-static const char* err_name[] = { "Special", "Standard", "UseAverage" };
+namespace {
+    const char* err_name[] = { "Special", "Standard", "UseAverage" };
+}
 
 std::ostream&
 operator << (std::ostream&    os,

Src/Base/AMReX_DistributionMapping.cpp

@@ -570,7 +570,7 @@ struct WeightedBoxList
     }
 };
 
-static
+namespace {
 void
 knapsack (const std::vector<Long>&         wgts,
           int                              nprocs,
@@ -712,6 +712,7 @@ top: ;
         }
     }
 }
+}
 
 void
 DistributionMapping::KnapSackDoIt (const std::vector<Long>& wgts,
@@ -1171,7 +1172,7 @@ namespace {
     }
 }
 
-static
+namespace {
 void
 Distribute (const std::vector<SFCToken>&     tokens,
             const std::vector<Long>&         wgts,
@@ -1254,6 +1255,7 @@ Distribute (const std::vector<SFCToken>&     tokens,
     BL_ASSERT(cnt == tokens.size());
 #endif
 }
+}
 
 void
 DistributionMapping::SFCProcessorMapDoIt (const BoxArray&          boxes,

Src/Base/AMReX_FabConv.cpp

@@ -170,7 +170,7 @@ RealDescriptor::clone () const
 // This exists solely to support reading "old" FABs.
 //
 
-static
+namespace {
 const int*
 selectOrdering (int prec,
                 int ordering)
@@ -208,6 +208,7 @@ selectOrdering (int prec,
     }
     return nullptr;
 }
+}
 
 //
 // This is here solely to support reading "old" FABs.
@@ -293,7 +294,7 @@ _pd_get_bit (char const* base,
 // for longer fields
 //
 
-static
+namespace {
 Long
 _pd_extract_field (char const* in,
                    int         offs,
@@ -367,7 +368,6 @@ _pd_extract_field (char const* in,
 //
 
 template <int NB>
-static
 void
 _pd_btrvout (char* out, Long  nitems)
 {
@@ -387,8 +387,10 @@ _pd_btrvout (char* out, Long  nitems)
     }
 }
 
-const int BitsMax       = 8*sizeof(Long);
-const int REVERSE_ORDER = 2;
+constexpr int BitsMax       = 8*sizeof(Long);
+constexpr int REVERSE_ORDER = 2;
+
+}
 
 //
 // Copy the least significant NB bits from the given Long into the byte array
@@ -487,7 +489,7 @@ _pd_set_bit (char* base, int offs)
 // on input.
 //
 
-static
+namespace {
 void
 _pd_reorder (char*      arr,
              Long       nitems,
@@ -512,7 +514,6 @@ _pd_reorder (char*      arr,
 // from inord to outord.
 //
 
-static
 void
 permute_real_word_order (void*       out,
                          const void* in,
@@ -786,7 +787,6 @@ PD_fconvert (void*       out,
     _pd_reorder((char*)out, nitems, outbytes, outord);
 }
 
-static
 void
 PD_fixdenormals (void*       out,
                  Long        nitems,
@@ -816,13 +816,15 @@ PD_fixdenormals (void*       out,
     }
 }
 
+}
+
 //
 // It's really sad that I need to do this ...
 //
 
 #undef  GETARRAY
+namespace {
 #define GETARRAY(TYPE)                                             \
-static                                                             \
 void                                                               \
 getarray (std::istream&  is,                                       \
           Vector< TYPE >& ar)                                       \
@@ -852,11 +854,12 @@ getarray (std::istream&  is,                                       \
 }
 GETARRAY(int)
 GETARRAY(Long)
+}
 #undef GETARRAY
 
 #undef  PUTARRAY
+namespace {
 #define PUTARRAY(TYPE)                 \
-static                                 \
 void                                   \
 putarray (std::ostream&        os,     \
           const Vector< TYPE >& ar)     \
@@ -874,6 +877,7 @@ putarray (std::ostream&        os,     \
 }
 PUTARRAY(int)
 PUTARRAY(Long)
+}
 #undef PUTARRAY
 
 std::ostream&
@@ -917,7 +921,7 @@ operator>> (std::istream&   is,
     return is;
 }
 
-static
+namespace {
 void
 PD_convert (void*                 out,
             const void*           in,
@@ -960,6 +964,7 @@ PD_convert (void*                 out,
         PD_fixdenormals(out, nitems, ord.format(), ord.order());
     }
 }
+}
 
 //
 // Convert nitems in RealDescriptor format to native Real format.

Src/Base/AMReX_GpuControl.H

@@ -184,13 +184,13 @@ namespace Gpu {
 
 #else
 
-    [[nodiscard]] inline static constexpr bool inLaunchRegion () { return false; }
-    [[nodiscard]] inline static constexpr bool notInLaunchRegion () { return true; }
-    [[nodiscard]] inline static constexpr bool setLaunchRegion (bool) { return false; }
+    [[nodiscard]] inline constexpr bool inLaunchRegion () { return false; }
+    [[nodiscard]] inline constexpr bool notInLaunchRegion () { return true; }
+    [[nodiscard]] inline constexpr bool setLaunchRegion (bool) { return false; }
 
-    [[nodiscard]] inline static constexpr bool inGraphRegion () { return false; }
-    [[nodiscard]] inline static constexpr bool notInGraphRegion () { return true; }
-    [[nodiscard]] inline static constexpr bool setGraphRegion (bool) { return false; }
+    [[nodiscard]] inline constexpr bool inGraphRegion () { return false; }
+    [[nodiscard]] inline constexpr bool notInGraphRegion () { return true; }
+    [[nodiscard]] inline constexpr bool setGraphRegion (bool) { return false; }
 
     struct [[nodiscard]] LaunchSafeGuard
     {
@@ -202,10 +202,10 @@ namespace Gpu {
         explicit GraphSafeGuard (bool) {}
     };
 
-    [[nodiscard]] inline static constexpr bool inSingleStreamRegion () { return false; }
-    [[nodiscard]] inline static constexpr bool inNoSyncRegion () { return true; }
-    [[nodiscard]] inline static constexpr bool setSingleStreamRegion (bool) { return false; }
-    [[nodiscard]] inline static constexpr bool setNoSyncRegion (bool) { return true; }
+    [[nodiscard]] inline constexpr bool inSingleStreamRegion () { return false; }
+    [[nodiscard]] inline constexpr bool inNoSyncRegion () { return true; }
+    [[nodiscard]] inline constexpr bool setSingleStreamRegion (bool) { return false; }
+    [[nodiscard]] inline constexpr bool setNoSyncRegion (bool) { return true; }
     struct [[nodiscard]] SingleStreamRegion {};
     struct [[nodiscard]] NoSyncRegion {};
 

Src/Base/AMReX_GpuLaunch.H

@@ -77,11 +77,11 @@ namespace amrex {
 namespace Gpu {
 
 #ifdef AMREX_USE_GPU
-    static constexpr std::size_t numThreadsPerBlockParallelFor () {
+    inline constexpr std::size_t numThreadsPerBlockParallelFor () {
         return AMREX_GPU_MAX_THREADS;
     }
 #else
-    static constexpr std::size_t numThreadsPerBlockParallelFor () { return 0; }
+    inline constexpr std::size_t numThreadsPerBlockParallelFor () { return 0; }
 #endif
 
 // ************************************************

Src/Base/AMReX_ParmParse.cpp

@@ -29,11 +29,13 @@ extern "C" void amrex_finalize_namelist ();
 
 namespace amrex {
 
+namespace {
 #ifdef AMREX_XSDK
-static bool finalize_verbose = false;
+    bool finalize_verbose = false;
 #else
-static bool finalize_verbose = true;
+    bool finalize_verbose = true;
 #endif
+}
 
 std::string const ParmParse::FileKeyword = "FILE";
 
@@ -1178,7 +1180,8 @@ ParmParse::appendTable(ParmParse::Table& tab)
   g_table.splice(g_table.end(), tab);
 }
 
-static
+namespace {
+
 bool
 unused_table_entries_q (const ParmParse::Table& table, const std::string& prefix = std::string())
 {
@@ -1215,7 +1218,6 @@ unused_table_entries_q (const ParmParse::Table& table, const std::string& prefix
     return false;
 }
 
-static
 void
 finalize_table (const std::string& pfx, const ParmParse::Table& table)
 {
@@ -1243,6 +1245,8 @@ finalize_table (const std::string& pfx, const ParmParse::Table& table)
     }
 }
 
+}
+
 void
 ParmParse::Initialize (int         argc,
                        char**      argv,
@@ -1278,7 +1282,7 @@ ParmParse::hasUnusedInputs (const std::string& prefix)
     return unused_table_entries_q(g_table, prefix);
 }
 
-static
+namespace {
 void
 get_entries_under_prefix (std::vector<std::string>& found_entries,
                          const ParmParse::Table& table,
@@ -1307,6 +1311,7 @@ get_entries_under_prefix (std::vector<std::string>& found_entries,
         }
     }
 }
+}
 
 std::vector<std::string>
 ParmParse::getUnusedInputs (const std::string& prefix)

Src/Base/AMReX_VisMF.cpp

@@ -11,9 +11,11 @@
 
 namespace amrex {
 
-static const char *TheMultiFabHdrFileSuffix = "_H";
-static const char *FabFileSuffix = "_D_";
-static const char *TheFabOnDiskPrefix = "FabOnDisk:";
+namespace {
+    const char *TheMultiFabHdrFileSuffix = "_H";
+    const char *FabFileSuffix = "_D_";
+    const char *TheFabOnDiskPrefix = "FabOnDisk:";
+}
 
 std::map<std::string, VisMF::PersistentIFStream> VisMF::persistentIFStreams;
 
@@ -192,7 +194,8 @@ operator>> (std::istream&            is,
     return is;
 }
 
-static
+namespace {
+
 std::ostream&
 operator<< (std::ostream&               os,
             const Vector< Vector<Real> >& ar)
@@ -217,7 +220,6 @@ operator<< (std::ostream&               os,
     return os;
 }
 
-static
 std::istream&
 operator>> (std::istream&         is,
             Vector< Vector<Real> >& ar)
@@ -265,6 +267,8 @@ operator>> (std::istream&         is,
     return is;
 }
 
+}
+
 std::ostream&
 operator<< (std::ostream        &os,
             const VisMF::Header &hd)