Merged PR 9800050: Fix compiler errors for 2.8.6 patch

fix compiler errors for 2.8.6 patch
microsoft · Oct 30, 2023 · 40f9baa · 40f9baa
1 parent e8cdf25
commit 40f9baa
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 3 deletions.
diff --git a/dev/AnimatedIcon/AnimatedIcon.cpp b/dev/AnimatedIcon/AnimatedIcon.cpp
@@ -10,6 +10,8 @@
 #include "Utils.h"
 #include <mutex>
 
+#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
+
 static constexpr wstring_view s_progressPropertyName{ L"Progress"sv };
 static constexpr wstring_view s_foregroundPropertyName{ L"Foreground"sv };
 static constexpr wstring_view s_transitionInfix{ L"To"sv };

diff --git a/dev/Common/ColorConversion.cpp b/dev/Common/ColorConversion.cpp
@@ -6,6 +6,9 @@
 #include "SharedHelpers.h"
 #include "ColorConversion.h"
 
+#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
+
+
 Rgb::Rgb(double r, double g, double b) : r{ r }, g{ g }, b{ b }
 {
 }

diff --git a/dev/NavigationView/TopNavigationViewDataProvider.h b/dev/NavigationView/TopNavigationViewDataProvider.h
@@ -13,8 +13,8 @@ enum class NavigationViewSplitVectorID
     Size = 4
 };
 
-using SplitDataSourceT = typename SplitDataSourceBase<winrt::IInspectable, NavigationViewSplitVectorID, float>;
-using SplitVectorT = typename SplitVector<winrt::IInspectable, NavigationViewSplitVectorID>;
+using SplitDataSourceT = typename ::SplitDataSourceBase<winrt::IInspectable, NavigationViewSplitVectorID, float>;
+using SplitVectorT = typename ::SplitVector<winrt::IInspectable, NavigationViewSplitVectorID>;
 
 class TopNavigationViewDataProvider: public SplitDataSourceT
 {

diff --git a/dev/NumberBox/NumberBoxParser.cpp b/dev/NumberBox/NumberBoxParser.cpp
@@ -6,6 +6,8 @@
 #include "NumberBoxParser.h"
 #include "Utils.h"
 
+#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
+
 static constexpr wstring_view c_numberBoxOperators{ L"+-*/^"sv };
 
 // Returns list of MathTokens from expression input string. If there are any parsing errors, it returns an empty vector.

diff --git a/dev/ProgressBar/ProgressBar.cpp b/dev/ProgressBar/ProgressBar.cpp
@@ -8,6 +8,8 @@
 #include "RuntimeProfiler.h"
 #include "ResourceAccessor.h"
 
+#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
+
 ProgressBar::ProgressBar()
 {
     __RP_Marker_ClassById(RuntimeProfiler::ProfId_ProgressBar);

diff --git a/dev/ProgressRing/ProgressRing.cpp b/dev/ProgressRing/ProgressRing.cpp
@@ -9,6 +9,8 @@
 #include "ResourceAccessor.h"
 #include "math.h"
 
+#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
+
 static constexpr wstring_view s_LayoutRootName{ L"LayoutRoot"sv };
 static constexpr wstring_view s_LottiePlayerName{ L"LottiePlayer"sv };
 static constexpr wstring_view s_DefaultForegroundThemeResourceName{ L"SystemControlHighlightAccentBrush"sv };

diff --git a/dev/TeachingTip/TeachingTip.cpp b/dev/TeachingTip/TeachingTip.cpp
@@ -13,6 +13,8 @@
 #include "../ResourceHelper/Utils.h"
 #include <enum_array.h>
 
+#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
+
 static constexpr auto c_TitleTextBlockVisibleStateName = L"ShowTitleTextBlock"sv;
 static constexpr auto c_TitleTextBlockCollapsedStateName = L"CollapseTitleTextBlock"sv;
 static constexpr auto c_SubtitleTextBlockVisibleStateName = L"ShowSubtitleTextBlock"sv;

diff --git a/dev/TreeView/TreeViewItem.cpp b/dev/TreeView/TreeViewItem.cpp
@@ -8,6 +8,8 @@
 #include "TreeViewList.h"
 #include "TreeViewItemTemplateSettings.h"
 
+#pragma warning(disable: 26813) // Use 'bitwise and' to check if a flag is set.
+
 TreeViewItem::TreeViewItem()
 {
     SetDefaultStyleKey(this);

diff --git a/dev/TreeView/TreeViewList.cpp b/dev/TreeView/TreeViewList.cpp
@@ -11,6 +11,8 @@
 #include "TreeViewList.properties.cpp"
 #include "DispatcherHelper.h"
 
+#pragma warning(disable: 26813) // Use 'bitwise and' to check if a flag is set.
+
 TreeViewList::TreeViewList()
 {
     ListViewModel(winrt::make_self<ViewModel>());

diff --git a/dev/TreeView/ViewModel.h b/dev/TreeView/ViewModel.h
@@ -6,7 +6,7 @@
 #include "TreeViewNode.h"
 
 using TreeNodeSelectionState = TreeViewNode::TreeNodeSelectionState;
-using ViewModelVectorOptions = typename VectorOptionsFromFlag<winrt::IInspectable, MakeVectorParam<VectorFlag::Observable, VectorFlag::DependencyObjectBase>()>;
+using ViewModelVectorOptions = typename ::VectorOptionsFromFlag<winrt::IInspectable, MakeVectorParam<VectorFlag::Observable, VectorFlag::DependencyObjectBase>()>;
 
 class ViewModel : 
     public ReferenceTracker<