eltorito.hpp: とりあえず「Boot Record Volume Descriptor」の手前まで

diff --git a/roast_ex/include/roast/file/iso9660/eltorito.hpp b/roast_ex/include/roast/file/iso9660/eltorito.hpp
index a01b10c..8107285 100644 (file)
--- a/roast_ex/include/roast/file/iso9660/eltorito.hpp
+++ b/roast_ex/include/roast/file/iso9660/eltorito.hpp
@@ -17,8 +17,34 @@ namespace roast
                {
                        using namespace ::roast::lexical::rule;
 
+<<<<<<< HEAD
                        typedef soft_repeat< unibyte<0>, 0x8800 > rule;
+=======
+                       //class str_CD001 : public fixed_string{ public: str_CD001()
+                       ROAST_LEXICAL_FIXSTR(str_CD001, "CD001")
+                       ROAST_LEXICAL_FIXSTR(str_ELTORITOSPEC, "EL TORITO SPECIFICATION")       //      23byte
+
+                       //      _volume_desc
+                       typedef seq<
+                               unibyte<0>,             //      Volume Descriptor Type
+                               str_CD001,
+                               unibyte<1>,             //      Volume Descriptor Version
+
+                               //      System Descriptor (32byte)
+                               str_ELTORITOSPEC,                               //      String 23byte
+                               soft_repeat< unibyte<0>, 9 >,   //      Padding (9byte)
+                               soft_repeat< unibyte<0>, 32 >   //      Volume Discriminator (32byte)
+                       > _volume_desc;
+
+                       //      rule
+                       typedef seq<
+                               soft_repeat< unibyte<0>, 0x8800 >,
+                               _volume_desc
+                       > rule;
+>>>>>>> 63d7ba7... eltorito.hpp: とりあえず「Boot Record Volume Descriptor」の手前まで
                }
+               
+               ////////////////////////////////////////////////////////
 
                class eltorito_writer
                {