From 5fbe1082ddf478cf3b4d62e9c26dbe004cbe93e5 Mon Sep 17 00:00:00 2001
From: Myun2 <myun2@nwhite.info>
Date: Wed, 11 Aug 2010 03:10:32 +0900
Subject: [PATCH] eltorito.hpp: detail fix.

---
 roast_ex/include/roast/file/iso9660/eltorito.hpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/roast_ex/include/roast/file/iso9660/eltorito.hpp b/roast_ex/include/roast/file/iso9660/eltorito.hpp
index 04a868c..c5eb4aa 100644
--- a/roast_ex/include/roast/file/iso9660/eltorito.hpp
+++ b/roast_ex/include/roast/file/iso9660/eltorito.hpp
@@ -10,8 +10,6 @@
 #include "roast/lexical/string_rule.hpp"
 #include "roast/math/endian.hpp"
 
-#define ROAST_SECTOR_NO_BRVD	(17)		//	Boot Record Volume Descriptor
-
 namespace roast
 {
 	namespace iso9660
@@ -29,6 +27,7 @@ namespace roast
 
 			enum
 			{
+				_brvd_sector_no = 17,	//	Boot Record Volume Descriptor
 				_boot_catalog_sector_no = 18,
 				_boot_sector_no = 19
 			};
@@ -85,14 +84,14 @@ namespace roast
 				fixed_uint<_boot_sector_no>,	//	Boot Sector No.
 
 				//	Zero Padding Sector Rest
-				soft_repeat< unibyte<0>, 2048 - 0x2B >
+				soft_repeat< unibyte<0>, 2048 - 0x2A >
 			> boot_catalog_sector;
 
 			//	rule
 			typedef seq<
-				soft_repeat< zero_padding_sector, ROAST_SECTOR_NO_BRVD >,	//	Zero Padding 17 Sectors
-				brvd_sector,
-				boot_catalog_sector
+				soft_repeat< zero_padding_sector, _brvd_sector_no >,	//	Zero Padding 17 Sectors
+				brvd_sector,			//	Boot Record Volume Descriptor Sector
+				boot_catalog_sector		//	Boot Catalog Sector
 			> rule;
 >>>>>>> 63d7ba7... eltorito.hpp: とりあえず「Boot Record Volume Descriptor」の手前まで
 		}
-- 
2.11.0