include/fc/log/logger.hpp

@@ -3,6 +3,7 @@
 #include <fc/time.hpp>
 #include <fc/log/appender.hpp>
 #include <fc/log/log_message.hpp>
+#include <cstddef>
 #include <memory>
 
 namespace fc
@@ -30,8 +31,8 @@ namespace fc
          ~logger();
          logger& operator=(const logger&);
          logger& operator=(logger&&);
-         friend bool operator==( const logger&, nullptr_t );
+         friend bool operator==( const logger&, std::nullptr_t );
-         friend bool operator!=( const logger&, nullptr_t );
+         friend bool operator!=( const logger&, std::nullptr_t );
 
          logger&    set_log_level( log_level e );
          log_level  get_log_level()const;

include/fc/utility.hpp

@@ -17,7 +17,6 @@
 
 namespace fc {
   using std::size_t;
-  typedef decltype(nullptr) nullptr_t;
 
   struct true_type  { enum _value { value = 1 }; };
   struct false_type { enum _value { value = 0 }; };

include/fc/variant.hpp

@@ -1,6 +1,7 @@
 #pragma once 
 
 #include <array>
+#include <cstddef>
 #include <deque>
 #include <map>
 #include <memory>
@@ -212,7 +213,7 @@ namespace fc
         /// Constructs a null_type variant
         variant();
         /// Constructs a null_type variant
-        variant( nullptr_t, uint32_t max_depth = 1 );
+        variant( std::nullptr_t, uint32_t max_depth = 1 );
 
         /// @param str - UTF8 string
         variant( const char* str, uint32_t max_depth = 1 );

src/log/logger.cpp

@@ -28,7 +28,7 @@ namespace fc {
     logger::logger()
     :my( new impl() ){}
 
-    logger::logger(nullptr_t){}
+    logger::logger(std::nullptr_t){}
 
     logger::logger( const string& name, const logger& parent )
     :my( new impl() )

src/variant.cpp

@@ -28,7 +28,7 @@ variant::variant()
    set_variant_type( this, null_type );
 }
 
-variant::variant( fc::nullptr_t, uint32_t max_depth )
+variant::variant( std::nullptr_t, uint32_t max_depth )
 {
    set_variant_type( this, null_type );
 }