From 8d6febf3921312a99f430af01fd9052ca1dab4d7 Mon Sep 17 00:00:00 2001 From: Nicholas Baron Date: Wed, 17 Apr 2019 20:40:53 -0700 Subject: [PATCH] Inlined variables to ensure one instantiation per program. --- src/CalcViewModel/Common/CopyPasteManager.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/CalcViewModel/Common/CopyPasteManager.h b/src/CalcViewModel/Common/CopyPasteManager.h index 1cd0d725..2ed5750f 100644 --- a/src/CalcViewModel/Common/CopyPasteManager.h +++ b/src/CalcViewModel/Common/CopyPasteManager.h @@ -13,14 +13,14 @@ namespace CalculatorUnitTests namespace CalculatorApp { - constexpr auto QwordType = 1; - constexpr auto DwordType = 2; - constexpr auto WordType = 3; - constexpr auto ByteType = 4; - constexpr auto HexBase = 5; - constexpr auto DecBase = 6; - constexpr auto OctBase = 7; - constexpr auto BinBase = 8; + inline constexpr auto QwordType = 1; + inline constexpr auto DwordType = 2; + inline constexpr auto WordType = 3; + inline constexpr auto ByteType = 4; + inline constexpr auto HexBase = 5; + inline constexpr auto DecBase = 6; + inline constexpr auto OctBase = 7; + inline constexpr auto BinBase = 8; class CopyPasteManager { @@ -32,7 +32,7 @@ namespace CalculatorApp return ClipboardTextFormat() >= 0; } - static constexpr auto PasteErrorString = L"NoOp"; + inline static constexpr auto PasteErrorString = L"NoOp"; private: static int ClipboardTextFormat();