Skip to content

Commit 40f9baa

Browse files
author
Dilip Ojha
committed
Merged PR 9800050: Fix compiler errors for 2.8.6 patch
fix compiler errors for 2.8.6 patch
1 parent e8cdf25 commit 40f9baa

File tree

10 files changed

+20
-3
lines changed

10 files changed

+20
-3
lines changed

dev/AnimatedIcon/AnimatedIcon.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#include "Utils.h"
1111
#include <mutex>
1212

13+
#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
14+
1315
static constexpr wstring_view s_progressPropertyName{ L"Progress"sv };
1416
static constexpr wstring_view s_foregroundPropertyName{ L"Foreground"sv };
1517
static constexpr wstring_view s_transitionInfix{ L"To"sv };

dev/Common/ColorConversion.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#include "SharedHelpers.h"
77
#include "ColorConversion.h"
88

9+
#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
10+
11+
912
Rgb::Rgb(double r, double g, double b) : r{ r }, g{ g }, b{ b }
1013
{
1114
}

dev/NavigationView/TopNavigationViewDataProvider.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ enum class NavigationViewSplitVectorID
1313
Size = 4
1414
};
1515

16-
using SplitDataSourceT = typename SplitDataSourceBase<winrt::IInspectable, NavigationViewSplitVectorID, float>;
17-
using SplitVectorT = typename SplitVector<winrt::IInspectable, NavigationViewSplitVectorID>;
16+
using SplitDataSourceT = typename ::SplitDataSourceBase<winrt::IInspectable, NavigationViewSplitVectorID, float>;
17+
using SplitVectorT = typename ::SplitVector<winrt::IInspectable, NavigationViewSplitVectorID>;
1818

1919
class TopNavigationViewDataProvider: public SplitDataSourceT
2020
{

dev/NumberBox/NumberBoxParser.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#include "NumberBoxParser.h"
77
#include "Utils.h"
88

9+
#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
10+
911
static constexpr wstring_view c_numberBoxOperators{ L"+-*/^"sv };
1012

1113
// Returns list of MathTokens from expression input string. If there are any parsing errors, it returns an empty vector.

dev/ProgressBar/ProgressBar.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include "RuntimeProfiler.h"
99
#include "ResourceAccessor.h"
1010

11+
#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
12+
1113
ProgressBar::ProgressBar()
1214
{
1315
__RP_Marker_ClassById(RuntimeProfiler::ProfId_ProgressBar);

dev/ProgressRing/ProgressRing.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#include "ResourceAccessor.h"
1010
#include "math.h"
1111

12+
#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
13+
1214
static constexpr wstring_view s_LayoutRootName{ L"LayoutRoot"sv };
1315
static constexpr wstring_view s_LottiePlayerName{ L"LottiePlayer"sv };
1416
static constexpr wstring_view s_DefaultForegroundThemeResourceName{ L"SystemControlHighlightAccentBrush"sv };

dev/TeachingTip/TeachingTip.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#include "../ResourceHelper/Utils.h"
1414
#include <enum_array.h>
1515

16+
#pragma warning(disable: 26478) // Don't use std::move on constant variables. (es.56).
17+
1618
static constexpr auto c_TitleTextBlockVisibleStateName = L"ShowTitleTextBlock"sv;
1719
static constexpr auto c_TitleTextBlockCollapsedStateName = L"CollapseTitleTextBlock"sv;
1820
static constexpr auto c_SubtitleTextBlockVisibleStateName = L"ShowSubtitleTextBlock"sv;

dev/TreeView/TreeViewItem.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include "TreeViewList.h"
99
#include "TreeViewItemTemplateSettings.h"
1010

11+
#pragma warning(disable: 26813) // Use 'bitwise and' to check if a flag is set.
12+
1113
TreeViewItem::TreeViewItem()
1214
{
1315
SetDefaultStyleKey(this);

dev/TreeView/TreeViewList.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#include "TreeViewList.properties.cpp"
1212
#include "DispatcherHelper.h"
1313

14+
#pragma warning(disable: 26813) // Use 'bitwise and' to check if a flag is set.
15+
1416
TreeViewList::TreeViewList()
1517
{
1618
ListViewModel(winrt::make_self<ViewModel>());

dev/TreeView/ViewModel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "TreeViewNode.h"
77

88
using TreeNodeSelectionState = TreeViewNode::TreeNodeSelectionState;
9-
using ViewModelVectorOptions = typename VectorOptionsFromFlag<winrt::IInspectable, MakeVectorParam<VectorFlag::Observable, VectorFlag::DependencyObjectBase>()>;
9+
using ViewModelVectorOptions = typename ::VectorOptionsFromFlag<winrt::IInspectable, MakeVectorParam<VectorFlag::Observable, VectorFlag::DependencyObjectBase>()>;
1010

1111
class ViewModel :
1212
public ReferenceTracker<

0 commit comments

Comments
 (0)