Reduce dependencies on common.h (countof).

Author: fdwr

Application.ixx

@@ -124,7 +124,7 @@ int Application::DisplayError(__in_z const char16_t* message, __in_z_opt const c
 
     StringCchPrintf(
         buffer,
-        countof(buffer),
+        std::size(buffer),
         ToWChar(formatString),
         ToWChar(message),
         functionResult
@@ -150,7 +150,7 @@ void Application::DebugLog(const char16_t* logMessage, ...)
     buffer[0] = 0;
     StringCchVPrintf(
         buffer,
-        countof(buffer),
+        std::size(buffer),
         ToWChar(logMessage),
         argList
         );

Common.String.ixx

@@ -385,8 +385,8 @@ void ConvertTextUtf8ToUtf16(
 
     // Skip byte-order-mark.
     int32_t startingOffset = 0;
-    if (utf8text.size() >= countof(utf8bom)
-    &&  memcmp(utf8text.data(), utf8bom, countof(utf8bom)) == 0)
+    if (utf8text.size() >= std::size(utf8bom)
+    &&  memcmp(utf8text.data(), utf8bom, std::size(utf8bom)) == 0)
     {
         startingOffset = ARRAYSIZE(utf8bom);
     }

Common.cpp

@@ -5,6 +5,7 @@
 #include "precomp.h"
 #include <string>
 #include <stdint.h>
+#include "Common.h"
 
 import Common.String;
 

Common.h

@@ -26,7 +26,7 @@ bool ThrowIf(bool value, _In_opt_z_ char const* message = nullptr);
 #define DEBUG_ASSERT assert
 
 template <typename T, size_t N>
-constexpr size_t countof(T(&a)[N])
+constexpr size_t countof(const T(&a)[N])
 {
     return N;// _countof(a);
 }

DWritEx.ixx

@@ -9,7 +9,7 @@
 #include "precomp.h"
 
 #include <windows.h>
-#include <Dwrite_2.h>
+#include <Dwrite_3.h>
 
 import Common.ArrayRef;
 import Common.String;

DrawableObjectAndValues.ixx

@@ -713,7 +713,7 @@ HRESULT DrawableObjectAndValues::Set(DrawableObjectAttribute attributeIndex, _In
 {
     // Set a single attribute's value, parsing the string according to attribute data type.
 
-    static_assert(_countof(values_) == countof(DrawableObject::attributeList), "Attribute and value arrays differ in size.");
+    static_assert(_countof(DrawableObjectAndValues::values_) == countof(DrawableObject::attributeList), "Attribute and value arrays differ in size.");
     if (attributeIndex >= countof(values_))
         E_INVALIDARG;
 

TextTreeParser.h

@@ -147,20 +147,6 @@
 // Generic.
 
 #include "Common.h"
-//!#include "Common.OptionalValue.h"
-//!#include "Common.AutoResource.h"
-//!#include "DWritEx.h"
-//!#include "Common.ListSubstringPrioritizer.h"
-
-//////////////////////////////
-// Application specific.
-
-//!#include "DrawingCanvas.h"
-//!#include "Attributes.h"
-//!#include "TextTreeParser.h"
-//!#include "DrawableObject.h"
-//!#include "DrawableObjectAndValues.h"
-//!#include "TextLayoutSampler.h"
 
 void DebugLog(const wchar_t* logMessage, ...);