parsers: rename YY_NULL as YY_NULLPTR to avoid conflicts with Flex

[bison.git] / data / variant.hh

diff --git a/data/variant.hh b/data/variant.hh
index 76c3e60dc1081f445532f96c03c13233b93a5871..633c29abc4c0da229335b3072f9310397b7501e3 100644 (file)
--- a/data/variant.hh
+++ b/data/variant.hh
@@ -95,7 +95,7 @@ m4_define([b4_variant_define],
 
     /// Empty construction.
     variant ()]b4_parse_assert_if([
-      : yytname_ (YY_NULL)])[
+      : yytname_ (YY_NULLPTR)])[
     {}
 
     /// Construct and fill.
@@ -198,7 +198,7 @@ m4_define([b4_variant_define],
     destroy ()
     {
       as<T> ().~T ();]b4_parse_assert_if([
-      yytname_ = YY_NULL;])[
+      yytname_ = YY_NULLPTR;])[
     }
 
   private: