From 0b26180575d9468b2cfb5b3c42f96e787683796f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Mon, 15 Apr 2019 15:02:48 -0700
Subject: [PATCH] Apply suggestions from code review

Co-Authored-By: danbelcher-MSFT <dabelc@microsoft.com>
---
 src/CalcManager/CalculatorManager.cpp | 1 +
 src/CalcManager/CalculatorVector.h    | 2 ++
 src/CalcManager/Ratpack/basex.cpp     | 1 +
 src/CalcManager/Ratpack/conv.cpp      | 1 +
 4 files changed, 5 insertions(+)

diff --git a/src/CalcManager/CalculatorManager.cpp b/src/CalcManager/CalculatorManager.cpp
index 9a213eac..2e93a457 100644
--- a/src/CalcManager/CalculatorManager.cpp
+++ b/src/CalcManager/CalculatorManager.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+#include <climits> // for UCHAR_MAX
 #include "Header Files/CalcEngine.h"
 #include "CalculatorManager.h"
 #include "CalculatorResource.h"
diff --git a/src/CalcManager/CalculatorVector.h b/src/CalcManager/CalculatorVector.h
index 04e69b3f..e9f1b8dc 100644
--- a/src/CalcManager/CalculatorVector.h
+++ b/src/CalcManager/CalculatorVector.h
@@ -7,6 +7,8 @@
 #include <vector>
 #include <winerror.h>
 #include "Ratpack/CalcErr.h"
+#include <stdexcept> // for std::out_of_range
+#include <sal.h> // for SAL
 
 template <typename TType>
 class CalculatorVector
diff --git a/src/CalcManager/Ratpack/basex.cpp b/src/CalcManager/Ratpack/basex.cpp
index 47172415..2685af87 100644
--- a/src/CalcManager/Ratpack/basex.cpp
+++ b/src/CalcManager/Ratpack/basex.cpp
@@ -15,6 +15,7 @@
 //
 //-----------------------------------------------------------------------------
 #include "ratpak.h"
+#include <cstring> // for memmove
 
 void _mulnumx( PNUMBER *pa, PNUMBER b );
 
diff --git a/src/CalcManager/Ratpack/conv.cpp b/src/CalcManager/Ratpack/conv.cpp
index f321806d..3a1aaa14 100644
--- a/src/CalcManager/Ratpack/conv.cpp
+++ b/src/CalcManager/Ratpack/conv.cpp
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <winerror.h>
 #include <sstream>
+#include <cstring> // for memmove, memcpy
 #include "ratpak.h"
 
 using namespace std;