Fix AEGIS build.

Author: highperformancecoder

classdesc.h

@@ -143,7 +143,8 @@ namespace classdesc
 
   using std::shared_ptr;
   using std::weak_ptr;
-
+  using std::dynamic_pointer_cast;
+  
   using std::is_default_constructible;
   using std::is_copy_constructible;
   using std::is_assignable;
@@ -229,6 +230,7 @@ namespace classdesc
 #if (!defined(__ICC) || __ICC > 1100)
   using std::tr1::shared_ptr;
   using std::tr1::weak_ptr;
+  using std::tr1::dynamic_pointer_cast;
 #endif
 
   // fake these using TR1 counterparts (which are conservative)
@@ -421,15 +423,15 @@ namespace classdesc
   ///@}
 
   /// transfer the constness property of T to U
-  template <class T, class U, bool c=std::is_const<T>::value> struct transfer_const;
+  template <class T, class U, bool c=is_const<T>::value> struct transfer_const;
   template <class T, class U> struct transfer_const<T,U,true>
   {
-    typedef typename std::add_const<U>::type type;
+    typedef typename add_const<U>::type type;
   };
 
   template <class T, class U> struct transfer_const<T,U,false>
   {
-    typedef typename std::remove_const<U>::type type;
+    typedef typename remove_const<U>::type type;
   };
 
   /// utility macro for declaring if a type has a particular member of

examples/graphnode.cc

@@ -28,10 +28,10 @@ using namespace classdesc;
 int foonode::nodecntr=0;
 
 // register in static object to get around leak detector
-vector<shared_ptr<foonode>> store;
+vector<shared_ptr<foonode> > store;
 
 foonode* newFoonode() {
-  store.push_back(make_shared<foonode>());
+  store.push_back(shared_ptr<foonode>(new foonode));
   return store.back().get();
 }
 

json_pack_base.h

@@ -44,9 +44,10 @@ namespace classdesc
       json_pack_error("json object %s not found", name.c_str()) {}
   };
 
-  const inline std::map<json5_parser::Value_type,RESTProcessType::Type>& RESTProcessTypeJSONMap()
+  typedef std::map<json5_parser::Value_type,RESTProcessType::Type> RESTProcessTypeJSONMap_t;
+  const inline RESTProcessTypeJSONMap_t& RESTProcessTypeJSONMap()
   {
-    static std::map<json5_parser::Value_type,RESTProcessType::Type> jsonMap;
+    static RESTProcessTypeJSONMap_t jsonMap;
     if (jsonMap.empty())
       {
         jsonMap[json5_parser::obj_type]=RESTProcessType::object;
@@ -63,21 +64,23 @@ namespace classdesc
   /// convert a json5_parser::Value_type to a RESTProcessType::Type
   inline RESTProcessType::Type Json5ParserTypeToRESTProcessType(json5_parser::Value_type type)
   {
-    auto r=RESTProcessTypeJSONMap().find(type);
+    RESTProcessTypeJSONMap_t::const_iterator r=RESTProcessTypeJSONMap().find(type);
     if (r!=RESTProcessTypeJSONMap().end()) return r->second;
     return RESTProcessType::null;
   }
-  
+
   /// convert a RESTProcessType::Type to a json5_parser::Value_type
   inline json5_parser::Value_type RESTProcessTypeToJson5ParserType(RESTProcessType::Type type)
   {
-    static std::map<RESTProcessType::Type,json5_parser::Value_type> jsonMap;
+    typedef std::map<RESTProcessType::Type,json5_parser::Value_type> Map;
+    static Map jsonMap;
     if (jsonMap.empty())
       {
-        auto& m=RESTProcessTypeJSONMap();
-        for (auto& i: m) jsonMap.emplace(i.second,i.first);
+        const RESTProcessTypeJSONMap_t& m=RESTProcessTypeJSONMap();
+        for (RESTProcessTypeJSONMap_t::const_iterator i=m.begin(); i!=m.end(); ++i)
+          jsonMap.insert(std::make_pair(i->second,i->first));
       }
-    auto r=jsonMap.find(type);
+    Map::const_iterator r=jsonMap.find(type);
     if (r!=jsonMap.end()) return r->second;
     return json5_parser::null_type;
   };

mpi-examples/Makefile

@@ -66,7 +66,7 @@ LIBS+=-ldl
 endif
 
 ifdef AEGIS
-CFLAGS+=-Werror -Wall -Wno-unused-variable 
+CFLAGS+=-Werror -Wall -Wno-unused-variable -Wno-unused-function 
 CPLUSPLUS+=-std=c++98
 endif
 

object.h

@@ -124,8 +124,12 @@ unpack(classdesc::unpack_t& b, const classdesc::string& d, classdesc::shared_ptr
   b>>t;
   if (t)
     {
-      std::shared_ptr<classdesc::object> tmp(classdesc::object::create(t-1));
-      a=std::dynamic_pointer_cast<T>(std::move(tmp));
+      classdesc::shared_ptr<classdesc::object> tmp(classdesc::object::create(t-1));
+#if defined(__cplusplus) && __cplusplus>=201103L
+      a=classdesc::dynamic_pointer_cast<T>(std::move(tmp));
+#else
+      a=classdesc::dynamic_pointer_cast<T>(tmp);
+#endif
       a->unpack(b);
     }
 }

test/testExclude.cc

@@ -16,7 +16,7 @@ int main()
 {
   pack_t b;
   foo f;
-  shared_ptr<bar> barPtr=make_shared<bar>();
+  shared_ptr<bar> barPtr(new bar);
   f.unpackable=barPtr.get();
   f.unpackable->barfoo();
   f.foosbar.barfoo();