From 9c707f06a253f7b298a10178adf9d1a289c23dc9 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 12 Jan 2014 00:17:17 +0100 Subject: [PATCH] udf: Move constant to header. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way, it is a compile time constant and Clang does no longer complain about dynamic arrays of non-POD types. Signed-off-by: Jérôme Duval --- src/add-ons/kernel/file_systems/udf/UdfStructures.cpp | 2 -- src/add-ons/kernel/file_systems/udf/UdfStructures.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/add-ons/kernel/file_systems/udf/UdfStructures.cpp b/src/add-ons/kernel/file_systems/udf/UdfStructures.cpp index 68e851d04d..175204db8f 100644 --- a/src/add-ons/kernel/file_systems/udf/UdfStructures.cpp +++ b/src/add-ons/kernel/file_systems/udf/UdfStructures.cpp @@ -685,8 +685,6 @@ implementation_use_descriptor::dump() const // partition_descriptor //---------------------------------------------------------------------- -const uint8 kMaxPartitionDescriptors = 2; - void partition_descriptor::dump() const { diff --git a/src/add-ons/kernel/file_systems/udf/UdfStructures.h b/src/add-ons/kernel/file_systems/udf/UdfStructures.h index 1f2634ebf6..05d7baff46 100644 --- a/src/add-ons/kernel/file_systems/udf/UdfStructures.h +++ b/src/add-ons/kernel/file_systems/udf/UdfStructures.h @@ -935,7 +935,7 @@ private: /*! \brief Maximum number of partition descriptors to be found in volume descriptor sequence, per UDF-2.50 */ -extern const uint8 kMaxPartitionDescriptors; +const uint8 kMaxPartitionDescriptors = 2; #define UDF_MAX_PARTITION_MAPS 2 #define UDF_MAX_PARTITION_MAP_SIZE 64