Merge topic 'cmPropertySentinel-definition' into release-4.1

319c427d2f cmPropertySentinel: update definition

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11129

Source/cmState.cxx

@@ -27,6 +27,10 @@
 #include "cmSystemTools.h"
 #include "cmake.h"
 
+namespace cmStateDetail {
+std::string const PropertySentinel = std::string{};
+} // namespace cmStateDetail
+
 cmState::cmState(Mode mode, ProjectKind projectKind)
   : StateMode(mode)
   , StateProjectKind(projectKind)

Source/cmStateDirectory.cxx

@@ -66,7 +66,7 @@ cmBTStringRange GetPropertyContent(T const& content, U contentEndPosition)
   auto end = content.begin() + contentEndPosition;
 
   auto rbegin = cm::make_reverse_iterator(end);
-  rbegin = std::find(rbegin, content.rend(), cmPropertySentinel);
+  rbegin = std::find(rbegin, content.rend(), cmStateDetail::PropertySentinel);
 
   return cmMakeRange(rbegin.base(), end);
 }
@@ -130,7 +130,7 @@ void cmStateDirectory::PrependIncludeDirectoriesEntry(
 
   auto rend = this->DirectoryState->IncludeDirectories.rend();
   auto rbegin = cm::make_reverse_iterator(entryEnd);
-  rbegin = std::find(rbegin, rend, cmPropertySentinel);
+  rbegin = std::find(rbegin, rend, cmStateDetail::PropertySentinel);
 
   auto entryIt = rbegin.base();
 
@@ -244,7 +244,7 @@ void cmStateDirectory::PrependLinkDirectoriesEntry(const BT<std::string>& vec)
 
   auto rend = this->DirectoryState->LinkDirectories.rend();
   auto rbegin = cm::make_reverse_iterator(entryEnd);
-  rbegin = std::find(rbegin, rend, cmPropertySentinel);
+  rbegin = std::find(rbegin, rend, cmStateDetail::PropertySentinel);
 
   auto entryIt = rbegin.base();
 

Source/cmStatePrivate.h

@@ -22,10 +22,9 @@
 namespace cmStateDetail {
 struct BuildsystemDirectoryStateType;
 struct PolicyStackEntry;
+extern std::string const PropertySentinel;
 } // namespace cmStateDetail
 
-static std::string const cmPropertySentinel = std::string();
-
 struct cmStateDetail::SnapshotDataType
 {
   cmStateDetail::PositionType ScopeParent;

Source/cmStateSnapshot.cxx

@@ -270,7 +270,8 @@ void InitializeContentFromParent(T& parentContent, T& thisContent,
 
   auto parentRbegin = cm::make_reverse_iterator(parentEnd);
   auto parentRend = parentContent.rend();
-  parentRbegin = std::find(parentRbegin, parentRend, cmPropertySentinel);
+  parentRbegin =
+    std::find(parentRbegin, parentRend, cmStateDetail::PropertySentinel);
   auto parentIt = parentRbegin.base();
 
   thisContent = std::vector<BT<std::string>>(parentIt, parentEnd);