clean

Author: hchunhui

include/json/value.h

@@ -234,6 +234,8 @@ class JSON_API Value {
 #endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
 
 public:
+  struct StaticInitTag {};
+  Value(StaticInitTag); ///< A special constructor for Value::null.
   /** \brief Create a default Value of the given type.
 
     This is a very useful constructor.
@@ -249,8 +251,6 @@ Json::Value arr_value(Json::arrayValue); // []
 Json::Value obj_value(Json::objectValue); // {}
 \endcode
   */
-  struct StaticInitTag {};
-  Value(StaticInitTag);
   Value(ValueType type = nullValue);
   Value(Int value);
   Value(UInt value);

src/lib_json/json_value.cpp

@@ -23,16 +23,6 @@
 
 namespace Json {
 
-// This is a walkaround to avoid the static initialization of Value::null.
-// kNull must be word-aligned to avoid crashing on ARM.  We use an alignment of
-// 8 (instead of 4) as a bit of future-proofing.
-#if defined(__ARMEL__)
-#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-#else
-// This exists for binary compatibility only. Use nullRef.
-const Value Value::null;
-#define ALIGNAS(byte_alignment)
-#endif
 static const Value kNull((Value::StaticInitTag()));
 const Value& Value::null = kNull;
 const Value& Value::nullRef = kNull;