Linux/MacOSX: remove calls to non existent class VolumeLayoutV1Hidden

This commit is contained in:
Mounir IDRASSI 2014-12-20 15:47:04 +01:00
parent 4b9f8b232b
commit 496701851f
2 changed files with 4 additions and 4 deletions

View File

@ -1366,7 +1366,7 @@ namespace VeraCrypt
if (layout->HasDriveHeader())
continue;
if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal) || typeid (*layout) == typeid (VolumeLayoutV1Hidden)))
if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal)))
continue;
if (legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV2Normal) || typeid (*layout) == typeid (VolumeLayoutV2Hidden)))

View File

@ -314,7 +314,7 @@ namespace VeraCrypt
if (hiddenVolume)
{
if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV1Normal) && typeid (*hiddenVolume->GetLayout()) != typeid (VolumeLayoutV1Hidden))
if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV1Normal))
throw ParameterIncorrect (SRC_POS);
if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV2Normal) && typeid (*hiddenVolume->GetLayout()) != typeid (VolumeLayoutV2Hidden))
@ -1363,7 +1363,7 @@ namespace VeraCrypt
}
shared_ptr <VolumeLayout> layout = volume->GetLayout();
if (typeid (*layout) == typeid (VolumeLayoutV1Normal) || typeid (*layout) == typeid (VolumeLayoutV1Hidden))
if (typeid (*layout) == typeid (VolumeLayoutV1Normal))
{
throw_err (LangString ["VOLUME_HAS_NO_BACKUP_HEADER"]);
}
@ -1443,7 +1443,7 @@ namespace VeraCrypt
if (layout->HasDriveHeader())
continue;
if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal) || typeid (*layout) == typeid (VolumeLayoutV1Hidden)))
if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal)))
continue;
if (legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV2Normal) || typeid (*layout) == typeid (VolumeLayoutV2Hidden)))