Skip to content

Commit c1a0183

Browse files
author
Oleh Kulykov
committed
1725888123
1 parent 7a68cf1 commit c1a0183

19 files changed

+56
-56
lines changed

‎src/CPP/7zip/Archive/7z/7zCompressionMode.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace NArchive {
1010
namespace N7z {
1111

12-
struct CMethodFull: public CMethodProps
12+
struct CMethodFull Z7_final: public CMethodProps
1313
{
1414
CMethodId Id;
1515
UInt32 NumStreams;
@@ -21,14 +21,14 @@ struct CMethodFull: public CMethodProps
2121
bool IsSimpleCoder() const { return NumStreams == 1; }
2222
};
2323

24-
struct CBond2
24+
struct CBond2 Z7_final
2525
{
2626
UInt32 OutCoder;
2727
UInt32 OutStream;
2828
UInt32 InCoder;
2929
};
3030

31-
struct CCompressionMethodMode
31+
struct CCompressionMethodMode Z7_final
3232
{
3333
/*
3434
if (Bonds.Empty()), then default bonds must be created

‎src/CPP/7zip/Archive/7z/7zDecode.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace NArchive {
1111
namespace N7z {
1212

13-
struct CBindInfoEx: public NCoderMixer2::CBindInfo
13+
struct CBindInfoEx Z7_final: public NCoderMixer2::CBindInfo
1414
{
1515
CRecordVector<CMethodId> CoderMethodIDs;
1616

@@ -21,7 +21,7 @@ struct CBindInfoEx: public NCoderMixer2::CBindInfo
2121
}
2222
};
2323

24-
class CDecoder
24+
class CDecoder Z7_final
2525
{
2626
bool _bindInfoPrev_Defined;
2727
#ifdef USE_MIXER_ST

‎src/CPP/7zip/Archive/7z/7zHeader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct CArchiveVersion
2929

3030
const Byte kMajorVersion = 0;
3131

32-
struct CStartHeader
32+
struct CStartHeader Z7_final
3333
{
3434
UInt64 NextHeaderOffset;
3535
UInt64 NextHeaderSize;

‎src/CPP/7zip/Archive/7z/7zIn.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace N7z {
3030
#define Z7_7Z_DECODER_CRYPRO_VARS , getTextPassword, isEncrypted, passwordIsDefined, password
3131
#endif
3232

33-
struct CParsedMethods
33+
struct CParsedMethods Z7_final
3434
{
3535
Byte Lzma2Prop;
3636
UInt32 LzmaDic;
@@ -175,7 +175,7 @@ struct CDatabase: public CFolders
175175
};
176176

177177

178-
struct CInArchiveInfo
178+
struct CInArchiveInfo Z7_final
179179
{
180180
CArchiveVersion Version;
181181
UInt64 StartPosition; // in stream
@@ -195,7 +195,7 @@ struct CInArchiveInfo
195195
};
196196

197197

198-
struct CDbEx: public CDatabase
198+
struct CDbEx Z7_final: public CDatabase
199199
{
200200
CInArchiveInfo ArcInfo;
201201

@@ -307,7 +307,7 @@ struct CDbEx: public CDatabase
307307

308308
const unsigned kNumBufLevelsMax = 4;
309309

310-
struct CInByte2
310+
struct CInByte2 Z7_final
311311
{
312312
const Byte *_buffer;
313313
public:
@@ -341,7 +341,7 @@ class CStreamSwitch;
341341

342342
const UInt32 kHeaderSize = 32;
343343

344-
class CInArchive
344+
class CInArchive Z7_final
345345
{
346346
friend class CStreamSwitch;
347347

‎src/CPP/7zip/Archive/7z/7zItem.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ typedef UInt32 CNum;
1717
const CNum kNumMax = 0x7FFFFFFF;
1818
const CNum kNumNoIndex = 0xFFFFFFFF;
1919

20-
struct CCoderInfo
20+
struct CCoderInfo Z7_final
2121
{
2222
CMethodId MethodID;
2323
CByteBuffer Props;
@@ -27,7 +27,7 @@ struct CCoderInfo
2727
};
2828

2929

30-
struct CBond
30+
struct CBond Z7_final
3131
{
3232
UInt32 PackIndex;
3333
UInt32 UnpackIndex;
@@ -90,7 +90,7 @@ struct CFolder
9090
};
9191

9292

93-
struct CUInt32DefVector
93+
struct CUInt32DefVector Z7_final
9494
{
9595
CBoolVector Defs;
9696
CRecordVector<UInt32> Vals;
@@ -137,7 +137,7 @@ struct CUInt32DefVector
137137
};
138138

139139

140-
struct CUInt64DefVector
140+
struct CUInt64DefVector Z7_final
141141
{
142142
CBoolVector Defs;
143143
CRecordVector<UInt64> Vals;
@@ -171,7 +171,7 @@ struct CUInt64DefVector
171171
};
172172

173173

174-
struct CFileItem
174+
struct CFileItem Z7_final
175175
{
176176
UInt64 Size;
177177
UInt32 Crc;

‎src/CPP/7zip/Archive/7z/7zOut.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace N7z {
1616

1717
const unsigned k_StartHeadersRewriteSize = 32;
1818

19-
class CWriteBufferLoc
19+
class CWriteBufferLoc Z7_final
2020
{
2121
Byte *_data;
2222
Byte *_dataLim;
@@ -57,7 +57,7 @@ class CWriteBufferLoc
5757
};
5858

5959

60-
struct CHeaderOptions
60+
struct CHeaderOptions Z7_final
6161
{
6262
bool CompressMainHeader;
6363
/*
@@ -77,7 +77,7 @@ struct CHeaderOptions
7777
};
7878

7979

80-
struct CFileItem2
80+
struct CFileItem2 Z7_final
8181
{
8282
UInt64 CTime;
8383
UInt64 ATime;
@@ -131,7 +131,7 @@ struct COutFolders
131131
};
132132

133133

134-
struct CArchiveDatabaseOut: public COutFolders
134+
struct CArchiveDatabaseOut Z7_final: public COutFolders
135135
{
136136
CRecordVector<UInt64> PackSizes;
137137
CUInt32DefVector PackCRCs;
@@ -249,7 +249,7 @@ struct CArchiveDatabaseOut: public COutFolders
249249
};
250250

251251

252-
class COutArchive
252+
class COutArchive Z7_final
253253
{
254254
HRESULT WriteDirect(const void *data, UInt32 size) { return WriteStream(SeqStream, data, size); }
255255

‎src/CPP/7zip/Archive/7z/7zUpdate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct CTreeFolder
2727
};
2828
*/
2929

30-
struct CUpdateItem
30+
struct CUpdateItem Z7_final
3131
{
3232
int IndexInArchive;
3333
unsigned IndexInClient;
@@ -86,7 +86,7 @@ struct CUpdateItem
8686
// UString GetExtension() const;
8787
};
8888

89-
struct CUpdateOptions
89+
struct CUpdateOptions Z7_final
9090
{
9191
const CCompressionMethodMode *Method;
9292
const CCompressionMethodMode *HeaderMethod;

‎src/CPP/7zip/Archive/Common/CoderMixer2.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Z7_CLASS_IMP_COM_2(
6868

6969
namespace NCoderMixer2 {
7070

71-
struct CBond
71+
struct CBond Z7_final
7272
{
7373
UInt32 PackIndex;
7474
UInt32 UnpackIndex;
@@ -78,7 +78,7 @@ struct CBond
7878
};
7979

8080

81-
struct CCoderStreamsInfo
81+
struct CCoderStreamsInfo Z7_final
8282
{
8383
UInt32 NumStreams;
8484
};
@@ -288,7 +288,7 @@ class CMixer
288288

289289
#ifdef USE_MIXER_ST
290290

291-
struct CCoderST: public CCoder
291+
struct CCoderST Z7_final: public CCoder
292292
{
293293
bool CanRead;
294294
bool CanWrite;
@@ -297,7 +297,7 @@ struct CCoderST: public CCoder
297297
};
298298

299299

300-
struct CStBinderStream
300+
struct CStBinderStream Z7_final
301301
{
302302
CSequentialInStreamCalcSize *InStreamSpec;
303303
COutStreamCalcSize *OutStreamSpec;
@@ -307,7 +307,7 @@ struct CStBinderStream
307307
};
308308

309309

310-
class CMixerST:
310+
class CMixerST Z7_final:
311311
public IUnknown,
312312
public CMixer,
313313
public CMyUnknownImp
@@ -358,7 +358,7 @@ class CMixerST:
358358

359359
#ifdef USE_MIXER_MT
360360

361-
class CCoderMT: public CCoder, public CVirtThread
361+
class CCoderMT Z7_final: public CCoder, public CVirtThread
362362
{
363363
Z7_CLASS_NO_COPY(CCoderMT)
364364
CRecordVector<ISequentialInStream*> InStreamPointers;
@@ -406,7 +406,7 @@ class CCoderMT: public CCoder, public CVirtThread
406406
};
407407

408408

409-
class CMixerMT:
409+
class CMixerMT Z7_final:
410410
public IUnknown,
411411
public CMixer,
412412
public CMyUnknownImp

‎src/CPP/7zip/Archive/Common/HandlerOut.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class CMultiMethodProps: public CCommonMethodProps
105105
};
106106

107107

108-
class CSingleMethodProps: public COneMethodInfo, public CCommonMethodProps
108+
class CSingleMethodProps Z7_final: public COneMethodInfo, public CCommonMethodProps
109109
{
110110
UInt32 _level;
111111

@@ -125,7 +125,7 @@ class CSingleMethodProps: public COneMethodInfo, public CCommonMethodProps
125125

126126
#endif
127127

128-
struct CHandlerTimeOptions
128+
struct CHandlerTimeOptions Z7_final
129129
{
130130
CBoolPair Write_MTime;
131131
CBoolPair Write_ATime;

‎src/CPP/7zip/Archive/Common/MultiStream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Z7_CLASS_IMP_IInStream(
1919

2020
public:
2121

22-
struct CSubStreamInfo
22+
struct CSubStreamInfo Z7_final
2323
{
2424
CMyComPtr<IInStream> Stream;
2525
UInt64 Size;

0 commit comments

Comments
 (0)