From ddfcec5f8756bb66c68ef6b18bf9dd3ea046838d Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Thu, 23 Aug 2018 11:24:12 -0400
Subject: [PATCH] json_spirit: Use ceph_assert for asserts.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/json_spirit/json_spirit_reader_template.h | 26 ++++++++++---------
 src/json_spirit/json_spirit_writer_template.h |  7 ++---
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/json_spirit/json_spirit_reader_template.h b/src/json_spirit/json_spirit_reader_template.h
index c50f885ec0de9..c0d3b90f0721d 100644
--- a/src/json_spirit/json_spirit_reader_template.h
+++ b/src/json_spirit/json_spirit_reader_template.h
@@ -37,6 +37,8 @@
     #define spirit_namespace boost::spirit
 #endif
 
+#include "include/assert.h"
+
 namespace json_spirit
 {
     const spirit_namespace::int_parser < boost::int64_t >  int64_p  = spirit_namespace::int_parser < boost::int64_t  >();
@@ -177,7 +179,7 @@ namespace json_spirit
     String_type get_str_( typename String_type::const_iterator begin, 
                        typename String_type::const_iterator end )
     {
-        assert( end - begin >= 2 );
+        ceph_assert( end - begin >= 2 );
 
         typedef typename String_type::const_iterator Iter_type;
 
@@ -233,35 +235,35 @@ namespace json_spirit
 
         void begin_obj( Char_type c )
         {
-            assert( c == '{' );
+            ceph_assert( c == '{' );
 
             begin_compound< Object_type >();
         }
 
         void end_obj( Char_type c )
         {
-            assert( c == '}' );
+            ceph_assert( c == '}' );
 
             end_compound();
         }
 
         void begin_array( Char_type c )
         {
-            assert( c == '[' );
+            ceph_assert( c == '[' );
      
             begin_compound< Array_type >();
         }
 
         void end_array( Char_type c )
         {
-            assert( c == ']' );
+            ceph_assert( c == ']' );
 
             end_compound();
         }
 
         void new_name( Iter_type begin, Iter_type end )
         {
-            assert( current_p_->type() == obj_type );
+            ceph_assert( current_p_->type() == obj_type );
 
             name_ = get_str< String_type >( begin, end );
         }
@@ -273,21 +275,21 @@ namespace json_spirit
 
         void new_true( Iter_type begin, Iter_type end )
         {
-            assert( is_eq( begin, end, "true" ) );
+            ceph_assert( is_eq( begin, end, "true" ) );
 
             add_to_current( true );
         }
 
         void new_false( Iter_type begin, Iter_type end )
         {
-            assert( is_eq( begin, end, "false" ) );
+            ceph_assert( is_eq( begin, end, "false" ) );
 
             add_to_current( false );
         }
 
         void new_null( Iter_type begin, Iter_type end )
         {
-            assert( is_eq( begin, end, "null" ) );
+            ceph_assert( is_eq( begin, end, "null" ) );
 
             add_to_current( Value_type() );
         }
@@ -314,7 +316,7 @@ namespace json_spirit
 
         Value_type* add_first( const Value_type& value )
         {
-            assert( current_p_ == 0 );
+            ceph_assert( current_p_ == 0 );
 
             value_ = value;
             current_p_ = &value_;
@@ -361,7 +363,7 @@ namespace json_spirit
                 return &current_p_->get_array().back(); 
             }
             
-            assert( current_p_->type() == obj_type );
+            ceph_assert( current_p_->type() == obj_type );
 
             return &Config_type::add( current_p_->get_obj(), name_, value );
         }
@@ -586,7 +588,7 @@ namespace json_spirit
 
         if( !info.hit )
         {
-            assert( false ); // in theory exception should already have been thrown
+            ceph_assert( false ); // in theory exception should already have been thrown
             throw_error( info.stop, "error" );
         }
 
diff --git a/src/json_spirit/json_spirit_writer_template.h b/src/json_spirit/json_spirit_writer_template.h
index c66037e1f9f78..4eec0b4ea6632 100644
--- a/src/json_spirit/json_spirit_writer_template.h
+++ b/src/json_spirit/json_spirit_writer_template.h
@@ -13,16 +13,17 @@
 #include "json_spirit_value.h"
 #include "json_spirit_writer_options.h"
 
-#include <cassert>
 #include <sstream>
 #include <iomanip>
 #include <boost/io/ios_state.hpp>
 
+#include "include/assert.h"
+
 namespace json_spirit
 {
     inline char to_hex_char( unsigned int c )
     {
-        assert( c <= 0xF );
+        ceph_assert( c <= 0xF );
 
         const char ch = static_cast< char >( c );
 
@@ -193,7 +194,7 @@ namespace json_spirit
                 case real_type:  output( value.get_real() );  break;
                 case int_type:   output_int( value );         break;
                 case null_type:  os_ << "null";               break;
-                default: assert( false );
+                default: ceph_assert( false );
             }
         }
 
-- 
2.39.5