Fixing compiler errors on MSVC Platform

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

Author: imikejackson

Source/SIMPLib/Common/Constants.h

@@ -37,9 +37,21 @@
 
 #if defined(_MSC_VER)
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+
+/*
+  "It's a known, long-standing bug in the compiler system's headers.  For
+  some reason the manufacturer, in its infinite wisdom, chose to #define
+  macros min() and max() in violation of the upper-case convention and so
+  break any legitimate functions with those names, including those in the
+  standard C++ library."
+  */
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #endif
 
 #include <limits>
+#include <cstdint>
 
 #include <QtCore/QString>
 
@@ -53,30 +65,29 @@
 namespace SIMPL
 {
 
-  typedef uint32_t Rgb;
-  const Rgb  RGB_MASK    = 0x00ffffff;                // masks RGB values
-  const QString PathSep("|");
-  static const uint8_t Unchecked = 0;
-  static const uint8_t PartiallyChecked = 1;
-  static const uint8_t Checked = 2;
-
-  enum InfoStringFormat
-  {
-    HtmlFormat = 0,
-//      JsonFormat,
-//      TextFormat,
-//      XmlFormat,
-    UnknownFormat
-  };
+using Rgb = uint32_t;
+const Rgb RGB_MASK = 0x00ffffff; // masks RGB values
+const QString PathSep("|");
+static const uint8_t Unchecked = 0;
+static const uint8_t PartiallyChecked = 1;
+static const uint8_t Checked = 2;
 
+enum InfoStringFormat
+{
+  HtmlFormat = 0,
+  //      JsonFormat,
+  //      TextFormat,
+  //      XmlFormat,
+  UnknownFormat
+};
 
-  /** @brief Constants defined for the Stacking order of images into a 3D Volume */
-  namespace RefFrameZDir
-  {
-    static const unsigned int LowtoHigh = 0;
-    static const unsigned int HightoLow = 1;
-    static const unsigned int UnknownRefFrameZDirection = 2;
-  }
+/** @brief Constants defined for the Stacking order of images into a 3D Volume */
+namespace RefFrameZDir
+{
+static const unsigned int LowtoHigh = 0;
+static const unsigned int HightoLow = 1;
+static const unsigned int UnknownRefFrameZDirection = 2;
+} // namespace RefFrameZDir
 
   namespace TypeNames
   {
@@ -203,7 +214,7 @@ namespace SIMPL
   {
     const QString None("None");
     const QString AnyPrimitive("Any");
-    static const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
+    const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
     //static const uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
     //static const uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
 
@@ -1060,7 +1071,7 @@ const signed int Horizontal = 0;
 const signed int Vertical = 1;
 const signed int Square = 2;
 };
-}
+} // namespace SIMPL
 
 namespace Core
 {

Source/SIMPLib/CoreFilters/Breakpoint.h

@@ -36,6 +36,7 @@
 #pragma once
 
 #include <QtCore/QWaitCondition>
+#include <QtCore/QMutex>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"

Source/SIMPLib/CoreFilters/PostSlackMessage.h

@@ -33,6 +33,7 @@
 #pragma once
 
 #include <QtCore/QWaitCondition>
+#include <QtCore/QMutex>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"

Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp

@@ -339,10 +339,10 @@ int H5PrecipitateStatsDataDelegate::writeVectorOfArrays(hid_t pid, VectorOfFloat
 int H5PrecipitateStatsDataDelegate::readVectorOfArrays(hid_t pid, VectorOfFloatArray colData)
 {
   int err = 0;
-
-  for(VectorOfFloatArray::iterator iter = colData.begin(); iter != colData.end(); ++iter)
+  for(auto& d : colData)
+  // for(VectorOfFloatArray::iterator iter = colData.begin(); iter != colData.end(); ++iter)
   {
-    FloatArrayType::Pointer d = *iter;
+    // FloatArrayType::Pointer d = *iter;
     err = d->readH5Data(pid);
     if(err < 0)
     {
@@ -564,17 +564,15 @@ int H5PrecipitateStatsDataDelegate::writeRDFDistributionData(hid_t pid, RdfData:
       }
       int32_t rank = 1;
       dims[0] = 3;
-      float boxRes[3] = {0.0f, 0.0f, 0.0f};
-      std::tie(boxRes[0], boxRes[1], boxRes[2]) = rdfData->getBoxResolution();
-      err = H5Lite::writePointerDataset(disId, SIMPL::StringConstants::RdfBoxRes.toStdString(), rank, dims.data(), boxRes);
+      std::array<float, 3> boxRes = rdfData->getBoxResolution();
+      err = H5Lite::writePointerDataset(disId, SIMPL::StringConstants::RdfBoxRes.toStdString(), rank, dims.data(), boxRes.data());
       if(err < 0)
       {
         return err;
       }
 
-      float boxDims[3] = {0.0f, 0.0f, 0.0f};
-      std::tie(boxDims[0], boxDims[1], boxDims[2]) = rdfData->getBoxSize();
-      err = H5Lite::writePointerDataset(disId, SIMPL::StringConstants::RdfBoxDims.toStdString(), rank, dims.data(), boxDims);
+      std::array<float, 3> boxDims = rdfData->getBoxSize();
+      err = H5Lite::writePointerDataset(disId, SIMPL::StringConstants::RdfBoxDims.toStdString(), rank, dims.data(), boxDims.data());
       if(err < 0)
       {
         return err;
@@ -769,10 +767,9 @@ int H5PrecipitateStatsDataDelegate::writeFeatureDiameterInfo(PrecipitateStatsDat
   /*
    * Feature Diameter Info is encode as 3 floats: BinStepSize, MaxDiameter, MinDiameter
    */
-  float featureDiameterInfo[3];
-  std::tie(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[2]) = data->getFeatureDiameterInfo();
+  std::array<float, 3> featureDiameterInfo = data->getFeatureDiameterInfo();
 
-  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo);
+  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo.data());
 }
 
 // -----------------------------------------------------------------------------

Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp

@@ -607,10 +607,9 @@ int H5TransformationStatsDataDelegate::writeFeatureDiameterInfo(TransformationSt
   /*
    * Feature Diameter Info is encode as 3 floats: BinStepSize, MaxDiameter, MinDiameter
    */
-  float featureDiameterInfo[3] = {0.0f, 0.0f, 0.0f};
-  std::tie(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[2]) = data->getFeatureDiameterInfo();
+  std::array<float, 3> featureDiameterInfo = data->getFeatureDiameterInfo();
 
-  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo);
+  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo.data());
 }
 
 // -----------------------------------------------------------------------------

Source/SIMPLib/StatsData/PrecipitateStatsData.cpp

@@ -78,8 +78,7 @@ PhaseType::Type PrecipitateStatsData::getPhaseType()
 // -----------------------------------------------------------------------------
 FloatArrayType::Pointer PrecipitateStatsData::generateBinNumbers()
 {
-  float featureDiameterInfo[3];
-  std::tie(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[2]) = getFeatureDiameterInfo();
+  std::array<float, 3> featureDiameterInfo = getFeatureDiameterInfo();
   QVector<float> bins;
   float d = featureDiameterInfo[2];
   while(d <= featureDiameterInfo[1])
@@ -108,8 +107,7 @@ StatsData::Pointer PrecipitateStatsData::deepCopy()
   ptr->setPrecipBoundaryFraction(getPrecipBoundaryFraction());
   ptr->setName(getName());
 
-  std::array<float, 3> diamInfo = {0.0f, 0.0f, 0.0f};
-  std::tie(diamInfo[0], diamInfo[1], diamInfo[2]) = getFeatureDiameterInfo();
+  std::array<float, 3> diamInfo = getFeatureDiameterInfo();
   ptr->setFeatureDiameterInfo(diamInfo[0], diamInfo[1], diamInfo[2]);
 
   SD_DEEP_COPY_VECTOR(FeatureSizeDistribution);
@@ -218,8 +216,7 @@ void PrecipitateStatsData::writeJson(QJsonObject& json)
   json.insert(SIMPL::StringConstants::PrecipitateBoundaryFraction, getPrecipBoundaryFraction());
 
   // Write the Feature Diameter Info
-  float diamInfo[3];
-  std::tie(diamInfo[0], diamInfo[1], diamInfo[2]) = getFeatureDiameterInfo();
+  std::array<float, 3> diamInfo = getFeatureDiameterInfo();
   QJsonArray diamInfoArray = {diamInfo[0], diamInfo[1], diamInfo[2]};
   json.insert(SIMPL::StringConstants::Feature_Diameter_Info, diamInfoArray);