Update LZMA SDK to 18.06.

Downloaded from https://www.7-zip.org/sdk.html.

Test: builds
Change-Id: Ibde10dfd8f5aca8e2e441524e9a703331a8c6d31

1 files changed, 10 insertions, 6 deletions

diff --git a/CPP/7zip/UI/Console/Main.cpp b/CPP/7zip/UI/Console/Main.cpp
index 8f2825c..906fa91 100644
--- a/CPP/7zip/UI/Console/Main.cpp
+++ b/CPP/7zip/UI/Console/Main.cpp
@@ -24,6 +24,7 @@
 #include "../../../Windows/TimeUtils.h"

 

 #include "../Common/ArchiveCommandLine.h"

+#include "../Common/Bench.h"

 #include "../Common/ExitCode.h"

 #include "../Common/Extract.h"

 

@@ -56,8 +57,6 @@ using namespace NCommandLineParser;
 HINSTANCE g_hInstance = 0;

 #endif

 

-extern bool g_LargePagesMode;

-

 extern CStdOutStream *g_StdStream;

 extern CStdOutStream *g_ErrStream;

 

@@ -236,7 +235,7 @@ static void PrintWarningsPaths(const CErrorPathCodes &pc, CStdOutStream &so)
 {

   FOR_VECTOR(i, pc.Paths)

   {

-    so.NormalizePrint_UString(pc.Paths[i]);

+    so.NormalizePrint_UString(fs2us(pc.Paths[i]));

     so << " : ";

     so << NError::MyFormatMessage(pc.Codes[i]) << endl;

   }

@@ -376,8 +375,13 @@ static void PrintMemUsage(const char *s, UInt64 val)
   *g_StdStream << "    " << s << " Memory =";

   PrintNum(SHIFT_SIZE_VALUE(val, 20), 7);

   *g_StdStream << " MB";

-  if (g_LargePagesMode)

-    *g_StdStream << " (LP)";

+

+  #ifdef _7ZIP_LARGE_PAGES

+  AString lp;

+  Add_LargePages_String(lp);

+  if (!lp.IsEmpty())

+    *g_StdStream << lp;

+  #endif

 }

 

 EXTERN_C_BEGIN

@@ -911,7 +915,7 @@ int Main2(
       {

         hashCalc = &hb;

         ThrowException_if_Error(hb.SetMethods(EXTERNAL_CODECS_VARS_L options.HashMethods));

-        hb.Init();

+        // hb.Init();

       }

       

       hresultMain = Extract(