Skip to content

Commit 998a40a

Browse files
committed
Serialization: Move SDK version to the end of the control block enum
1 parent 76e7fa9 commit 998a40a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/Serialization/ModuleFormat.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -861,11 +861,11 @@ namespace control_block {
861861
MODULE_NAME,
862862
TARGET,
863863
SDK_NAME,
864-
SDK_VERSION,
865864
REVISION,
866865
IS_OSSA,
867866
ALLOWABLE_CLIENT_NAME,
868867
CHANNEL,
868+
SDK_VERSION,
869869
};
870870

871871
using MetadataLayout = BCRecordLayout<
@@ -896,11 +896,6 @@ namespace control_block {
896896
BCBlob
897897
>;
898898

899-
using SDKVersionLayout = BCRecordLayout<
900-
SDK_VERSION,
901-
BCBlob
902-
>;
903-
904899
using RevisionLayout = BCRecordLayout<
905900
REVISION,
906901
BCBlob
@@ -920,6 +915,11 @@ namespace control_block {
920915
CHANNEL,
921916
BCBlob
922917
>;
918+
919+
using SDKVersionLayout = BCRecordLayout<
920+
SDK_VERSION,
921+
BCBlob
922+
>;
923923
}
924924

925925
/// The record types within the options block (a sub-block of the control

lib/Serialization/Serialization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,11 +834,11 @@ void Serializer::writeBlockInfoBlock() {
834834
BLOCK_RECORD(control_block, MODULE_NAME);
835835
BLOCK_RECORD(control_block, TARGET);
836836
BLOCK_RECORD(control_block, SDK_NAME);
837-
BLOCK_RECORD(control_block, SDK_VERSION);
838837
BLOCK_RECORD(control_block, REVISION);
839838
BLOCK_RECORD(control_block, IS_OSSA);
840839
BLOCK_RECORD(control_block, ALLOWABLE_CLIENT_NAME);
841840
BLOCK_RECORD(control_block, CHANNEL);
841+
BLOCK_RECORD(control_block, SDK_VERSION);
842842

843843
BLOCK(OPTIONS_BLOCK);
844844
BLOCK_RECORD(options_block, SDK_PATH);

0 commit comments

Comments
 (0)