AEGIS build fixes

Author: highperformancecoder

json_pack_base.h

@@ -88,9 +88,11 @@ namespace classdesc
 
     template <class T> 
     explicit json_pack_t(const T& x, typename enable_if<
+                         And<
                          And<
                          Not<is_base_of<json5_parser::mValue,T> >,
-                         Not<is_base_of<json5_parser::mArray,T> >,
+                         Not<is_base_of<json5_parser::mArray,T> >
+                         >,
                          Not<is_base_of<json5_parser::mObject,T> >
                          >, dummy<1> >::T* d=0);
 
@@ -173,9 +175,11 @@ namespace classdesc
 
   template <class T>
   json_pack_t::json_pack_t(const T& x, typename enable_if<
+                           And<
                            And<
                            Not<is_base_of<json5_parser::mValue,T> >,
-                           Not<is_base_of<json5_parser::mArray,T> >,
+                           Not<is_base_of<json5_parser::mArray,T> >
+                           >,
                            Not<is_base_of<json5_parser::mObject,T> >
                            >, dummy<1> >::T*):
     json5_parser::mValue(json5_parser::mObject()),

pack_base.h

@@ -71,6 +71,7 @@ namespace classdesc
 #pragma GCC diagnostic push
       // gcc is not clever enough to delve into xdr to know this is not uninitialised
 #pragma GCC diagnostic ignored "-Wuninitialized"
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
 #ifdef XDR_PACK