update boost

linx64/include/boost/spirit/home/classic/meta/impl/fundamental.ipp

@@ -33,8 +33,7 @@ namespace impl
         template <typename ParserT, typename LeafCountT>
         struct count {
 
-            // __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
-            enum { value = (LeafCountT::value + 1) };
+            BOOST_STATIC_CONSTANT(int, value = (LeafCountT::value + 1));
         };
     };
 
@@ -47,9 +46,8 @@ namespace impl
             typedef typename ParserT::subject_t             subject_t;
             typedef typename subject_t::parser_category_t   subject_category_t;
 
-            // __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
-            enum { value = (nodes<subject_category_t>
-                ::template count<subject_t, LeafCountT>::value + 1) };
+            BOOST_STATIC_CONSTANT(int, value = (nodes<subject_category_t>
+                ::template count<subject_t, LeafCountT>::value + 1));
         };
     };
 
@@ -62,9 +60,8 @@ namespace impl
             typedef typename ParserT::subject_t             subject_t;
             typedef typename subject_t::parser_category_t   subject_category_t;
 
-            // __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
-            enum { value = (nodes<subject_category_t>
-                ::template count<subject_t, LeafCountT>::value + 1) };
+            BOOST_STATIC_CONSTANT(int, value = (nodes<subject_category_t>
+                ::template count<subject_t, LeafCountT>::value + 1));
         };
     };
 
@@ -81,14 +78,14 @@ namespace impl
 
             typedef count self_t;
 
-            // __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
-            enum {
+            BOOST_STATIC_CONSTANT(int,
                 leftcount = (nodes<left_category_t>
-                    ::template count<left_t, LeafCountT>::value),
+                    ::template count<left_t, LeafCountT>::value));
+            BOOST_STATIC_CONSTANT(int,
                 rightcount = (nodes<right_category_t>
-                    ::template count<right_t, LeafCountT>::value),
-                value = ((self_t::leftcount) + (self_t::rightcount) + 1)
-            };
+                    ::template count<right_t, LeafCountT>::value));
+            BOOST_STATIC_CONSTANT(int,
+                value = ((self_t::leftcount) + (self_t::rightcount) + 1));
         };
     };
 
@@ -108,8 +105,7 @@ namespace impl
         template <typename ParserT, typename LeafCountT>
         struct count {
 
-            // __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
-            enum { value = (LeafCountT::value + 1) };
+            BOOST_STATIC_CONSTANT(int, value = (LeafCountT::value + 1));
         };
     };
 
@@ -122,9 +118,8 @@ namespace impl
             typedef typename ParserT::subject_t             subject_t;
             typedef typename subject_t::parser_category_t   subject_category_t;
 
-            // __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
-            enum { value = (leafs<subject_category_t>
-                ::template count<subject_t, LeafCountT>::value) };
+            BOOST_STATIC_CONSTANT(int, value = (leafs<subject_category_t>
+                ::template count<subject_t, LeafCountT>::value));
         };
     };
 
@@ -137,9 +132,8 @@ namespace impl
             typedef typename ParserT::subject_t             subject_t;
             typedef typename subject_t::parser_category_t   subject_category_t;
 
-            // __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
-            enum { value = (leafs<subject_category_t>
-                ::template count<subject_t, LeafCountT>::value) };
+            BOOST_STATIC_CONSTANT(int, value = (leafs<subject_category_t>
+                ::template count<subject_t, LeafCountT>::value));
         };
     };
 
@@ -156,14 +150,14 @@ namespace impl
 
             typedef count self_t;
 
-            // __BORLANDC__ == 0x0561 isn't happy with BOOST_STATIC_CONSTANT
-            enum {
+            BOOST_STATIC_CONSTANT(int,
                 leftcount = (leafs<left_category_t>
-                    ::template count<left_t, LeafCountT>::value),
+                    ::template count<left_t, LeafCountT>::value));
+            BOOST_STATIC_CONSTANT(int,
                 rightcount = (leafs<right_category_t>
-                    ::template count<right_t, LeafCountT>::value),
-                value = (self_t::leftcount + self_t::rightcount)
-            };
+                    ::template count<right_t, LeafCountT>::value));
+            BOOST_STATIC_CONSTANT(int,
+                value = (self_t::leftcount + self_t::rightcount));
         };
     };