Fix build with new Text path

DFIR-ORC · Feb 10, 2021 · 3eb9fc5 · 3eb9fc5
1 parent c081dc8
commit 3eb9fc5
Show file tree

Hide file tree

Showing 84 changed files with 160 additions and 160 deletions.
diff --git a/src/FastFind/stdafx.h b/src/FastFind/stdafx.h
@@ -30,6 +30,6 @@
 
 // Do not declare fmt ostream/printf before any fmt specialization.
 // Could be a regression from https://github.com/fmtlib/fmt/issues/952
-#include "Output/Text/Fmt/Formatter.h"
+#include "Text/Fmt/Formatter.h"
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
diff --git a/src/Orc/Orc.cpp b/src/Orc/Orc.cpp
@@ -26,7 +26,7 @@
 #include "DD.h"
 
 #include "Output/Console/Console.h"
-#include "Output/Text/Tree.h"
+#include "Text/Tree.h"
 
 #include "ToolVersion.h"
 #include "Usage.h"

diff --git a/src/Orc/stdafx.h b/src/Orc/stdafx.h
@@ -30,6 +30,6 @@
 
 // Do not declare fmt ostream/printf before any fmt specialization.
 // Could be a regression from https://github.com/fmtlib/fmt/issues/952
-#include "Output/Text/Fmt/Formatter.h"
+#include "Text/Fmt/Formatter.h"
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
diff --git a/src/OrcApacheOrcLib/ApacheOrcStream.cpp b/src/OrcApacheOrcLib/ApacheOrcStream.cpp
@@ -11,7 +11,7 @@
 #include "ApacheOrcStream.h"
 
 #include "Log/Log.h"
-#include "Output/Text/Fmt/error_code.h"
+#include "Text/Fmt/error_code.h"
 #include "Utils/Result.h"
 
 uint64_t Orc::TableOutput::ApacheOrc::Stream::getLength() const

diff --git a/src/OrcApacheOrcLib/stdafx.h b/src/OrcApacheOrcLib/stdafx.h
@@ -69,7 +69,7 @@
 
 // Do not declare fmt ostream/printf before any fmt specialization.
 // Could be a regression from https://github.com/fmtlib/fmt/issues/952
-#include "Output/Text/Fmt/Formatter.h"
+#include "Text/Fmt/Formatter.h"
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
 

diff --git a/src/OrcCommand/Command/WolfLauncher/WolfLauncher_Output.cpp b/src/OrcCommand/Command/WolfLauncher/WolfLauncher_Output.cpp
@@ -12,11 +12,11 @@
 #include "SystemDetails.h"
 #include "ToolVersion.h"
 #include "Usage.h"
-#include "Output/Text/Fmt/WolfPriority.h"
-#include "Output/Text/Print/OutputSpec.h"
-#include "Output/Text/Print/LocationSet.h"
-#include "Output/Text/Print/Bool.h"
-#include "Output/Text/Print/Recipient.h"
+#include "Text/Fmt/WolfPriority.h"
+#include "Text/Print/OutputSpec.h"
+#include "Text/Print/LocationSet.h"
+#include "Text/Print/Bool.h"
+#include "Text/Print/Recipient.h"
 
 using namespace Orc::Command::Wolf;
 using namespace Orc::Text;

diff --git a/src/OrcCommand/Command/WolfLauncher/WolfLauncher_Run.cpp b/src/OrcCommand/Command/WolfLauncher/WolfLauncher_Run.cpp
@@ -30,8 +30,8 @@
 #include "Utils/TypeTraits.h"
 #include "Utils/Time.h"
 #include "Utils/WinApi.h"
-#include "Output/Text/Fmt/Result.h"
-#include "Output/Text/Print/Bool.h"
+#include "Text/Fmt/Result.h"
+#include "Text/Print/Bool.h"
 
 using namespace Concurrency;
 using namespace Orc;

diff --git a/src/OrcCommand/DD_Output.cpp b/src/OrcCommand/DD_Output.cpp
@@ -14,9 +14,9 @@
 
 #include "Usage.h"
 
-#include "Output/Text/Fmt/formatter.h"
-#include "Output/Text/Print/Bool.h"
-#include "Output/Text/Print/OutputSpec.h"
+#include "Text/Fmt/formatter.h"
+#include "Text/Print/Bool.h"
+#include "Text/Print/OutputSpec.h"
 
 using namespace Orc;
 using namespace Orc::Command::DD;

diff --git a/src/OrcCommand/FastFind_Output.cpp b/src/OrcCommand/FastFind_Output.cpp
@@ -18,7 +18,7 @@
 
 #include "Usage.h"
 
-#include "Output/Text/Print/OutputSpec.h"
+#include "Text/Print/OutputSpec.h"
 
 using namespace Orc;
 using namespace Orc::Command::FastFind;

diff --git a/src/OrcCommand/FatInfo_Output.cpp b/src/OrcCommand/FatInfo_Output.cpp
@@ -13,9 +13,9 @@
 
 #include "ToolVersion.h"
 
-#include "Output/Text/Print/OutputSpec.h"
-#include "Output/Text/Print/Intentions.h"
-#include "Output/Text/Print/Filter.h"
+#include "Text/Print/OutputSpec.h"
+#include "Text/Print/Intentions.h"
+#include "Text/Print/Filter.h"
 
 #include "Usage.h"
 

diff --git a/src/OrcCommand/FatInfo_Run.cpp b/src/OrcCommand/FatInfo_Run.cpp
@@ -14,7 +14,7 @@
 #include "FatFileInfo.h"
 #include "FileInfoCommon.h"
 
-#include "Output/Text/Print/Location.h"
+#include "Text/Print/Location.h"
 
 using namespace Orc;
 using namespace Orc::Command::FatInfo;

diff --git a/src/OrcCommand/GetSamples_Output.cpp b/src/OrcCommand/GetSamples_Output.cpp
@@ -14,9 +14,9 @@
 #include <string>
 
 #include "Usage.h"
-#include "Output/Text/Fmt/formatter.h"
-#include "Output/Text/Print/Bool.h"
-#include "Output/Text/Print/OutputSpec.h"
+#include "Text/Fmt/formatter.h"
+#include "Text/Print/Bool.h"
+#include "Text/Print/OutputSpec.h"
 
 using namespace Orc::Command::GetSamples;
 using namespace Orc::Text;

diff --git a/src/OrcCommand/GetSectors_Output.cpp b/src/OrcCommand/GetSectors_Output.cpp
@@ -13,8 +13,8 @@
 #include "Usage.h"
 
 #include "Utils/TypeTraits.h"
-#include "Output/Text/Fmt/Limit.h"
-#include "Output/Text/Print/Bool.h"
+#include "Text/Fmt/Limit.h"
+#include "Text/Print/Bool.h"
 
 using namespace Orc::Command::GetSectors;
 using namespace Orc::Text;

diff --git a/src/OrcCommand/GetThis_Output.cpp b/src/OrcCommand/GetThis_Output.cpp
@@ -16,12 +16,12 @@
 #include "FileFind.h"
 #include "ToolVersion.h"
 
-#include "Output/Text/Print.h"
-#include "Output/Text/Fmt/formatter.h"
-#include "Output/Text/Print/Bool.h"
-#include "Output/Text/Print/LocationSet.h"
-#include "Output/Text/Print/OutputSpec.h"
-#include "Output/Text/Print/SearchTerm.h"
+#include "Text/Print.h"
+#include "Text/Fmt/formatter.h"
+#include "Text/Print/Bool.h"
+#include "Text/Print/LocationSet.h"
+#include "Text/Print/OutputSpec.h"
+#include "Text/Print/SearchTerm.h"
 #include "Utils/MakeArray.h"
 #include "Usage.h"
 

diff --git a/src/OrcCommand/Mothership_Output.cpp b/src/OrcCommand/Mothership_Output.cpp
@@ -10,7 +10,7 @@
 
 #include "Mothership.h"
 
-#include "Output/Text/Print/Bool.h"
+#include "Text/Print/Bool.h"
 #include "ToolVersion.h"
 #include "Usage.h"
 

diff --git a/src/OrcCommand/NTFSInfo_Output.cpp b/src/OrcCommand/NTFSInfo_Output.cpp
@@ -16,11 +16,11 @@
 
 #include "ToolVersion.h"
 #include "SystemDetails.h"
-#include "Output/Text/Print/OutputSpec.h"
-#include "Output/Text/Print/Intentions.h"
-#include "Output/Text/Print/Filter.h"
-#include "Output/Text/Print/LocationSet.h"
-#include "Output/Text/Print/Location.h"
+#include "Text/Print/OutputSpec.h"
+#include "Text/Print/Intentions.h"
+#include "Text/Print/Filter.h"
+#include "Text/Print/LocationSet.h"
+#include "Text/Print/Location.h"
 
 #include "Usage.h"
 

diff --git a/src/OrcCommand/NTFSInfo_Run.cpp b/src/OrcCommand/NTFSInfo_Run.cpp
@@ -28,7 +28,7 @@
 #include "ParameterCheck.h"
 #include "Privilege.h"
 #include "EmbeddedResource.h"
-#include "Output/Text/Print/Location.h"
+#include "Text/Print/Location.h"
 
 using namespace std;
 

diff --git a/src/OrcCommand/NTFSUtil.h b/src/OrcCommand/NTFSUtil.h
@@ -12,7 +12,7 @@
 
 #include "UtilitiesMain.h"
 
-#include "Output/Text/Fmt/Offset.h"
+#include "Text/Fmt/Offset.h"
 
 #pragma managed(push, off)
 

diff --git a/src/OrcCommand/NTFSUtil_Output.cpp b/src/OrcCommand/NTFSUtil_Output.cpp
@@ -16,7 +16,7 @@
 #include "SystemDetails.h"
 #include "ToolVersion.h"
 #include "Usage.h"
-#include "Output/Text/Print.h"
+#include "Text/Print.h"
 #include "Output/Console/Console.h"
 
 using namespace std;

diff --git a/src/OrcCommand/NTFSUtil_Run.cpp b/src/OrcCommand/NTFSUtil_Run.cpp
@@ -28,12 +28,12 @@
 #include "OfflineMFTReader.h"
 
 #include "Utils/TypeTraits.h"
-#include "Output/Text/Fmt/Limit.h"
-#include "Output/Text/Fmt/formatter.h"
-#include "Output/Text/Format.h"
-#include "Output/Text/Print/LocationSet.h"
-#include "Output/Text/Print/Ntfs.h"
-#include "Output/Text/HexDump.h"
+#include "Text/Fmt/Limit.h"
+#include "Text/Fmt/formatter.h"
+#include "Text/Format.h"
+#include "Text/Print/LocationSet.h"
+#include "Text/Print/Ntfs.h"
+#include "Text/HexDump.h"
 #include "Utils/Guard.h"
 
 using namespace std;

diff --git a/src/OrcCommand/RegInfo_Output.cpp b/src/OrcCommand/RegInfo_Output.cpp
@@ -14,8 +14,8 @@
 
 #include "ToolVersion.h"
 
-#include "Output/Text/Print/LocationSet.h"
-#include "Output/Text/Print/OutputSpec.h"
+#include "Text/Print/LocationSet.h"
+#include "Text/Print/OutputSpec.h"
 
 #include "Usage.h"
 

diff --git a/src/OrcCommand/Text/Fmt/WolfPriority.h b/src/OrcCommand/Text/Fmt/WolfPriority.h
@@ -12,7 +12,7 @@
 
 #include <system_error>
 
-#include "Output/Text/Format.h"
+#include "Text/Format.h"
 #include "Utils/Iconv.h"
 
 template <>

diff --git a/src/OrcCommand/Text/Print/Recipient.h b/src/OrcCommand/Text/Print/Recipient.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Output/Text/Print.h"
+#include "Text/Print.h"
 
 #include <boost/algorithm/string/join.hpp>
 

diff --git a/src/OrcCommand/ToolEmbed_Output.cpp b/src/OrcCommand/ToolEmbed_Output.cpp
@@ -14,8 +14,8 @@
 #include "ToolVersion.h"
 #include "Usage.h"
 
-#include "Output/Text/Print/OutputSpec.h"
-#include "Output/Text/Print/EmbedSpec.h"
+#include "Text/Print/OutputSpec.h"
+#include "Text/Print/EmbedSpec.h"
 
 SYSTEMTIME theStartTime;
 SYSTEMTIME theFinishTime;

diff --git a/src/OrcCommand/USNInfo_Output.cpp b/src/OrcCommand/USNInfo_Output.cpp
@@ -16,9 +16,9 @@
 
 #include "ToolVersion.h"
 
-#include "Output/Text/Print/OutputSpec.h"
-#include "Output/Text/Print/Bool.h"
-#include "Output/Text/Print/LocationSet.h"
+#include "Text/Print/OutputSpec.h"
+#include "Text/Print/Bool.h"
+#include "Text/Print/LocationSet.h"
 
 #include "Usage.h"
 

diff --git a/src/OrcCommand/Usage.h b/src/OrcCommand/Usage.h
@@ -7,7 +7,7 @@
 //
 #pragma once
 
-#include "Output/Text/Tree.h"
+#include "Text/Tree.h"
 
 #include "FSUtils.h"
 

diff --git a/src/OrcCommand/UtilitiesMain.h b/src/OrcCommand/UtilitiesMain.h
@@ -42,11 +42,11 @@
 #include "ExtensionLibrary.h"
 #include "Log/Log.h"
 #include "Output/Console/Console.h"
-#include "Output/Text/Print.h"
-#include "Output/Text/Fmt/FILE_NAME.h"
-#include "Output/Text/Fmt/FILETIME.h"
-#include "Output/Text/Fmt/SYSTEMTIME.h"
-#include "Output/Text/Fmt/TimeUtc.h"
+#include "Text/Print.h"
+#include "Text/Fmt/FILE_NAME.h"
+#include "Text/Fmt/FILETIME.h"
+#include "Text/Fmt/SYSTEMTIME.h"
+#include "Text/Fmt/TimeUtc.h"
 #include "Utils/Guard.h"
 #include "UtilitiesLogger.h"
 

diff --git a/src/OrcCommand/stdafx.h b/src/OrcCommand/stdafx.h
@@ -63,7 +63,7 @@
 
 // Do not declare fmt ostream/printf before any fmt specialization.
 // Could be a regression from https://github.com/fmtlib/fmt/issues/952
-#include "Output/Text/Fmt/Formatter.h"
+#include "Text/Fmt/Formatter.h"
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
 

diff --git a/src/OrcLib/CryptoHashStream.h b/src/OrcLib/CryptoHashStream.h
@@ -14,7 +14,7 @@
 
 #include "CryptoUtilities.h"
 #include "CryptoHashStreamAlgorithm.h"
-#include "Output/Text/Fmt/CryptoHashStreamAlgorithm.h"
+#include "Text/Fmt/CryptoHashStreamAlgorithm.h"
 
 #pragma managed(push, off)
 

diff --git a/src/OrcLib/ExtensionLibrary.cpp b/src/OrcLib/ExtensionLibrary.cpp
@@ -15,8 +15,8 @@
 #include "SystemDetails.h"
 
 #include "Robustness.h"
-#include "Output/Text/Fmt/path.h"
-#include "Output/Text/Fmt/optional.h"
+#include "Text/Fmt/path.h"
+#include "Text/Fmt/optional.h"
 
 #include "Log/Log.h"
 

diff --git a/src/OrcLib/FSVBR.h b/src/OrcLib/FSVBR.h
@@ -12,7 +12,7 @@
 #include "FSVBR_FSType.h"
 
 #include "FatDataStructures.h"
-#include "Output/Text/Fmt/FSVBR.h"
+#include "Text/Fmt/FSVBR.h"
 
 #pragma managed(push, off)
 

diff --git a/src/OrcLib/FuzzyHashStream.h b/src/OrcLib/FuzzyHashStream.h
@@ -10,7 +10,7 @@
 #include "HashStream.h"
 
 #include "FuzzyHashStreamAlgorithm.h"
-#include "Output/Text/Fmt/FuzzyHashStreamAlgorithm.h"
+#include "Text/Fmt/FuzzyHashStreamAlgorithm.h"
 
 #pragma managed(push, off)
 

diff --git a/src/OrcLib/Limit.h b/src/OrcLib/Limit.h
@@ -11,7 +11,7 @@
 
 #include "Utils/TypeTraits.h"
 
-#include "Output/Text/Fmt/Limit.h"
+#include "Text/Fmt/Limit.h"
 
 namespace Orc {
 

diff --git a/src/OrcLib/Location.h b/src/OrcLib/Location.h
@@ -15,7 +15,7 @@
 #include "VolumeShadowCopies.h"
 #include "DiskExtent.h"
 #include "FSVBR.h"
-#include "Output/Text/Fmt/LocationType.h"
+#include "Text/Fmt/LocationType.h"
 
 #pragma managed(push, off)
 

diff --git a/src/OrcLib/NTFSCompression.cpp b/src/OrcLib/NTFSCompression.cpp
@@ -11,7 +11,7 @@
 #include "NTFSCompression.h"
 #include "Utils/TypeTraits.h"
 #include "Log/Log.h"
-#include "Output/Text/Fmt/ByteQuantity.h"
+#include "Text/Fmt/ByteQuantity.h"
 
 /* uncompression values */
 constexpr auto NTFS_TOKEN_MASK = 1;

diff --git a/src/OrcLib/OrcException.h b/src/OrcLib/OrcException.h
@@ -14,7 +14,7 @@
 
 #include <strsafe.h>
 
-#include "Output/Text/Fmt/optional.h"
+#include "Text/Fmt/optional.h"
 
 #pragma managed(push, off)