Put LineInfo in separate h/cpp

6 files changed, 37 insertions, 24 deletions

diff --git a/toolsrc/include/LineInfo.h b/toolsrc/include/LineInfo.h
new file mode 100644
index 000000000..a3de4fc29
--- /dev/null
+++ b/toolsrc/include/LineInfo.h
@@ -0,0 +1,17 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct LineInfo
+    {
+        int line_number;
+        const char* file_name;
+
+        constexpr LineInfo() : line_number(0), file_name(nullptr) {}
+        constexpr LineInfo(const int line_number, const char* file_name) : line_number(line_number), file_name(file_name) {}
+
+        std::string toString() const;
+    };
+}
+
+#define VCPKG_LINE_INFO vcpkg::LineInfo(__LINE__, __FILE__)
diff --git a/toolsrc/include/vcpkg_Checks.h b/toolsrc/include/vcpkg_Checks.h
index 328e0238a..76c86cfab 100644
--- a/toolsrc/include/vcpkg_Checks.h
+++ b/toolsrc/include/vcpkg_Checks.h
@@ -1,22 +1,7 @@
 #pragma once
 
 #include "vcpkg_Strings.h"
-
-namespace vcpkg
-{
-    struct LineInfo
-    {
-        int line_number;
-        const char* file_name;
-
-        constexpr LineInfo() : line_number(0), file_name(nullptr) {}
-        constexpr LineInfo(const int line_number, const char* file_name) : line_number(line_number), file_name(file_name) {}
-
-        std::string toString() const;
-    };
-}
-
-#define VCPKG_LINE_INFO vcpkg::LineInfo(__LINE__, __FILE__)
+#include "LineInfo.h"
 
 namespace vcpkg::Checks
 {
diff --git a/toolsrc/src/LineInfo.cpp b/toolsrc/src/LineInfo.cpp
new file mode 100644
index 000000000..fa26355e4
--- /dev/null
+++ b/toolsrc/src/LineInfo.cpp
@@ -0,0 +1,11 @@
+#include "pch.h"
+#include "LineInfo.h"
+#include "vcpkg_Strings.h"
+
+namespace vcpkg
+{
+    std::string LineInfo::toString() const
+    {
+        return Strings::format("%s(%d)", this->file_name, this->line_number);
+    }
+}
diff --git a/toolsrc/src/vcpkg_Checks.cpp b/toolsrc/src/vcpkg_Checks.cpp
index 95ef7c60f..911f1d9f8 100644
--- a/toolsrc/src/vcpkg_Checks.cpp
+++ b/toolsrc/src/vcpkg_Checks.cpp
@@ -3,14 +3,6 @@
 #include "vcpkg_System.h"
 #include "vcpkglib.h"
 
-namespace vcpkg
-{
-    std::string LineInfo::toString() const
-    {
-        return Strings::format("%s(%d)", this->file_name, this->line_number);
-    }
-}
-
 namespace vcpkg::Checks
 {
     __declspec(noreturn) void unreachable(const LineInfo& line_info)
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj
index dd5dd124a..237af6543 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj
@@ -138,6 +138,7 @@
   <ItemGroup>
     <ClInclude Include="..\include\BinaryParagraph.h" />
     <ClInclude Include="..\include\lazy.h" />
+    <ClInclude Include="..\include\LineInfo.h" />
     <ClInclude Include="..\include\PostBuildLint_BuildInfo.h" />
     <ClInclude Include="..\include\PostBuildLint_BuildPolicies.h" />
     <ClInclude Include="..\include\coff_file_reader.h" />
@@ -181,6 +182,7 @@
   <ItemGroup>
     <ClCompile Include="..\src\BinaryParagraph.cpp" />
     <ClCompile Include="..\src\commands_ci.cpp" />
+    <ClCompile Include="..\src\LineInfo.cpp" />
     <ClCompile Include="..\src\PostBuildLint_BuildInfo.cpp" />
     <ClCompile Include="..\src\PostBuildLint_BuildPolicies.cpp" />
     <ClCompile Include="..\src\coff_file_reader.cpp" />
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
index d701321be..60eaa167a 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
@@ -171,6 +171,9 @@
     <ClCompile Include="..\src\vcpkg_Chrono.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\LineInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\package_spec.h">
@@ -296,5 +299,8 @@
     <ClInclude Include="..\include\lazy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\LineInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file