Refactoring: rename "cm_static_string_view.hxx" as <cmext/string_view>

2025-10-16 05:26:58 +08:00 · 2020-04-27 16:38:14 +02:00
parent 2291253c1b
commit 8d4a9ee398
38 changed files with 43 additions and 66 deletions
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -698,7 +698,6 @@ set(SRCS
  cmWriteFileCommand.cxx
  cmWriteFileCommand.h

-  cm_static_string_view.hxx
  cm_get_date.h
  cm_get_date.c
  cm_utf8.h
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -5,7 +5,7 @@
 #include <cstring>
 #include <sstream>

-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmCTest.h"
 #include "cmCTestBuildHandler.h"
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/Source/CTest/cmCTestConfigureCommand.cxx
@@ -6,7 +6,7 @@
 #include <sstream>
 #include <vector>

-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmCTest.h"
 #include "cmCTestConfigureHandler.h"
--- a/Source/CTest/cmCTestCoverageCommand.cxx
+++ b/Source/CTest/cmCTestCoverageCommand.cxx
@@ -5,8 +5,7 @@
 #include <set>

 #include <cmext/algorithm>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmCTest.h"
 #include "cmCTestCoverageHandler.h"
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -7,7 +7,7 @@
 #include <cstring>
 #include <sstream>

-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmCTest.h"
 #include "cmCTestGenericHandler.h"
--- a/Source/CTest/cmCTestMemCheckCommand.cxx
+++ b/Source/CTest/cmCTestMemCheckCommand.cxx
@@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCTestMemCheckCommand.h"

-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmCTest.h"
 #include "cmCTestMemCheckHandler.h"
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -9,8 +9,7 @@
 #include <cm/memory>
 #include <cm/vector>
 #include <cmext/algorithm>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmCTest.h"
 #include "cmCTestSubmitHandler.h"
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <sstream>

-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmCTest.h"
 #include "cmCTestGenericHandler.h"
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -20,13 +20,13 @@
 #include <cm/memory>
 #include <cm/string_view>
 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/FStream.hxx"
 #include <cmsys/Base64.h>
 #include <cmsys/Directory.hxx>
 #include <cmsys/RegularExpression.hxx>

-#include "cm_static_string_view.hxx"
 #include "cm_utf8.h"

 #include "cmCTest.h"
--- a/Source/CTest/cmCTestUploadCommand.cxx
+++ b/Source/CTest/cmCTestUploadCommand.cxx
@@ -6,8 +6,7 @@
 #include <sstream>

 #include <cm/vector>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmCTest.h"
 #include "cmCTestUploadHandler.h"
--- a/Source/cmArgumentParser.h
+++ b/Source/cmArgumentParser.h
@@ -12,8 +12,7 @@
 #include <vector>

 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 namespace ArgumentParser {

--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -19,6 +19,7 @@
 #include <cm/memory>
 #include <cm/string_view>
 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/Base64.h"
 #include "cmsys/Directory.hxx"
@@ -36,8 +37,6 @@
 #  include <unistd.h> // IWYU pragma: keep
 #endif

-#include "cm_static_string_view.hxx"
-
 #include "cmCTestBuildAndTestHandler.h"
 #include "cmCTestBuildHandler.h"
 #include "cmCTestConfigureHandler.h"
--- a/Source/cmConfigureFileCommand.cxx
+++ b/Source/cmConfigureFileCommand.cxx
@@ -5,8 +5,7 @@
 #include <set>

 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmExecutionStatus.h"
 #include "cmMakefile.h"
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -8,9 +8,9 @@
 #include <sstream>
 #include <utility>

-#include "cmsys/Directory.hxx"
+#include <cmext/string_view>

-#include "cm_static_string_view.hxx"
+#include "cmsys/Directory.hxx"

 #include "cmExportTryCompileFileGenerator.h"
 #include "cmGlobalGenerator.h"
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -10,11 +10,10 @@
 #include <vector>

 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/Process.h"

-#include "cm_static_string_view.hxx"
-
 #include "cmArgumentParser.h"
 #include "cmExecutionStatus.h"
 #include "cmMakefile.h"
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -8,11 +8,10 @@

 #include <cm/memory>
 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/RegularExpression.hxx"

-#include "cm_static_string_view.hxx"
-
 #include "cmArgumentParser.h"
 #include "cmExecutionStatus.h"
 #include "cmExportBuildAndroidMKGenerator.h"
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -17,13 +17,13 @@

 #include <cm/memory>
 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/FStream.hxx"
 #include "cmsys/Glob.hxx"
 #include "cmsys/RegularExpression.hxx"

 #include "cm_kwiml.h"
-#include "cm_static_string_view.hxx"
 #include "cm_sys_stat.h"

 #include "cmAlgorithms.h"
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -18,8 +18,7 @@

 #include <cm/memory>
 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmExecutionStatus.h"
 #include "cmFunctionBlocker.h"
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -7,8 +7,7 @@
 #include <cm/memory>
 #include <cm/string_view>
 #include <cmext/algorithm>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmExecutionStatus.h"
 #include "cmFunctionBlocker.h"
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -7,8 +7,7 @@
 #include <utility>

 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmGeneratorExpressionContext.h"
 #include "cmGeneratorExpressionEvaluator.h"
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -17,12 +17,11 @@
 #include <cm/string_view>
 #include <cm/vector>
 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/RegularExpression.hxx"
 #include "cmsys/String.h"

-#include "cm_static_string_view.hxx"
-
 #include "cmAlgorithms.h"
 #include "cmGeneratorExpression.h"
 #include "cmGeneratorExpressionContext.h"
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -18,11 +18,10 @@
 #include <cm/memory>
 #include <cm/string_view>
 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/RegularExpression.hxx"

-#include "cm_static_string_view.hxx"
-
 #include "cmAlgorithms.h"
 #include "cmComputeLinkInformation.h"
 #include "cmCustomCommand.h"
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -7,8 +7,7 @@

 #include <cm/memory>
 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmConditionEvaluator.h"
 #include "cmExecutionStatus.h"
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -8,11 +8,10 @@
 #include <utility>

 #include <cm/memory>
+#include <cmext/string_view>

 #include "cmsys/Glob.hxx"

-#include "cm_static_string_view.hxx"
-
 #include "cmArgumentParser.h"
 #include "cmExecutionStatus.h"
 #include "cmExportSet.h"
--- a/Source/cmInstallCommandArguments.cxx
+++ b/Source/cmInstallCommandArguments.cxx
@@ -4,7 +4,7 @@

 #include <utility>

-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmRange.h"
 #include "cmSystemTools.h"
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -17,11 +17,10 @@

 #include <cm/memory>
 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/RegularExpression.hxx"

-#include "cm_static_string_view.hxx"
-
 #include "cmAlgorithms.h"
 #include "cmExecutionStatus.h"
 #include "cmGeneratorExpression.h"
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -8,8 +8,7 @@
 #include <cm/memory>
 #include <cm/string_view>
 #include <cmext/algorithm>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmExecutionStatus.h"
 #include "cmFunctionBlocker.h"
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -18,13 +18,13 @@
 #include <cm/optional>
 #include <cm/vector>
 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/FStream.hxx"
 #include "cmsys/RegularExpression.hxx"

 #include "cm_jsoncpp_value.h"
 #include "cm_jsoncpp_writer.h"
-#include "cm_static_string_view.hxx"
 #include "cm_sys_stat.h"

 #include "cmCommandArgumentParserHelper.h"
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -6,8 +6,7 @@
 #include <utility>

 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmExecutionStatus.h"
 #include "cmMakefile.h"
--- a/Source/cmString.hxx
+++ b/Source/cmString.hxx
@@ -16,8 +16,7 @@
 #include <utility>

 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 namespace cm {

--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -11,11 +11,10 @@
 #include <memory>

 #include <cm/iterator>
+#include <cmext/string_view>

 #include "cmsys/RegularExpression.hxx"

-#include "cm_static_string_view.hxx"
-
 #include "cmCryptoHash.h"
 #include "cmExecutionStatus.h"
 #include "cmGeneratorExpression.h"
--- a/Source/cmSubcommandTable.h
+++ b/Source/cmSubcommandTable.h
@@ -11,8 +11,7 @@
 #include <vector>

 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 class cmExecutionStatus;

--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -7,8 +7,7 @@

 #include <cm/memory>
 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmConditionEvaluator.h"
 #include "cmExecutionStatus.h"
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -19,12 +19,12 @@
 #endif

 #include <cmext/algorithm>
+#include <cmext/string_view>

 #include "cmsys/FStream.hxx"
 #include "cmsys/Glob.hxx"
 #include "cmsys/RegularExpression.hxx"

-#include "cm_static_string_view.hxx"
 #include "cm_sys_stat.h"

 #include "cmCommands.h"
--- a/Tests/CMakeLib/testArgumentParser.cxx
+++ b/Tests/CMakeLib/testArgumentParser.cxx
@@ -7,8 +7,7 @@
 #include <vector>

 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmArgumentParser.h"

--- a/Tests/CMakeLib/testString.cxx
+++ b/Tests/CMakeLib/testString.cxx
@@ -12,8 +12,7 @@
 #include <utility>

 #include <cm/string_view>
-
-#include "cm_static_string_view.hxx"
+#include <cmext/string_view>

 #include "cmString.hxx"

--- a/Utilities/std/CMakeLists.txt
+++ b/Utilities/std/CMakeLists.txt
@@ -9,6 +9,7 @@ set(SRCS cm/bits/string_view.cxx
         cm/optional
         cm/shared_mutex
         cm/string_view
-         cm/utility)
+         cm/utility
+         cmext/string_view)

 add_library(cmstd STATIC ${SRCS})
--- a/Source/cm_static_string_view.hxx
+++ b/Source/cm_static_string_view.hxx
@@ -1,9 +1,10 @@
+// -*-c++-*-
+// vim: set ft=cpp:
+
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
   file Copyright.txt or https://cmake.org/licensing for details.  */
-#ifndef cm_static_string_view_hxx
-#define cm_static_string_view_hxx
-
-#include "cmConfigure.h" // IWYU pragma: keep
+#ifndef cmext_string_view
+#define cmext_string_view

 #include <cstddef>