Per #3006, default_column_union was defined in 2 spots. Renaming one …

…of them to avoid compilation conflict.
dtcenter · Dec 31, 2024 · f3b577a · f3b577a
1 parent 909401e
commit f3b577a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/tools/tc_utils/tc_stat/tc_stat_job.cc b/src/tools/tc_utils/tc_stat/tc_stat_job.cc
@@ -2015,7 +2015,7 @@ void TCStatJobSummary::clear() {
    SummaryMap.clear();
 
    // Set to default value
-   ColumnUnion = default_column_union;
+   ColumnUnion = default_tc_column_union;
    OutAlpha    = default_tc_alpha;
    FSPThresh   = default_fsp_thresh;
 
@@ -2125,7 +2125,7 @@ ConcatString TCStatJobSummary::serialize() const {
    // Add summary job-specific options
    for(i=0; i<ReqColumn.n(); i++)
       s << "-column " << ReqColumn[i] << " ";
-   if(ColumnUnion != default_column_union)
+   if(ColumnUnion != default_tc_column_union)
       s << "-column_union " << bool_to_string(ColumnUnion) << " ";
    if(!(FSPThresh == default_fsp_thresh))
       s << "-fsp_thresh " << FSPThresh.get_str();

diff --git a/src/tools/tc_utils/tc_stat/tc_stat_job.h b/src/tools/tc_utils/tc_stat/tc_stat_job.h
@@ -28,10 +28,10 @@
 ////////////////////////////////////////////////////////////////////////
 
 // Defaults to be used if not specified by the user
-static const bool         default_column_union = false;
-static const bool         default_water_only   = false;
-static const bool         default_match_points = false;
-static const bool         default_event_equal  = false;
+static const bool         default_tc_column_union = false;
+static const bool         default_water_only      = false;
+static const bool         default_match_points    = false;
+static const bool         default_event_equal     = false;
 
 // Default rapid intensification is an increase of 30 kts over 24 hours
 static const TrackType    default_rirw_track  = TrackType::None;