import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / spirit / home / classic / core / non_terminal / impl / rule.ipp

diff --git a/ceph/src/boost/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp b/ceph/src/boost/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
index 137694ef2f6bb0a754c4f0b2090cc045f436d156..87eb717dbe3dcc95b359026de32d79c0869ea009 100644 (file)
--- a/ceph/src/boost/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
+++ b/ceph/src/boost/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
@@ -114,8 +114,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 
         class rule_base_access
         {
-#if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+#if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
         public: // YUCK!
 #else
             template <
@@ -233,16 +232,16 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
         struct concrete_parser : abstract_parser<ScannerT, AttrT>
         {
             concrete_parser(ParserT const& p_) : p(p_) {}
-            virtual ~concrete_parser() {}
+            ~concrete_parser() BOOST_OVERRIDE {}
 
-            virtual typename match_result<ScannerT, AttrT>::type
-            do_parse_virtual(ScannerT const& scan) const
+            typename match_result<ScannerT, AttrT>::type
+            do_parse_virtual(ScannerT const& scan) const BOOST_OVERRIDE
             {
                 return p.parse(scan);
             }
 
-            virtual abstract_parser<ScannerT, AttrT>*
-            clone() const
+            abstract_parser<ScannerT, AttrT>*
+            clone() const BOOST_OVERRIDE
             {
                 return new concrete_parser(p);
             }