Bug #2049: allow virtual inheritance from multiple PUPable base classes

Change-Id: I7ed18e50c1abf386a7e414762e5545dfc0c61b8a
charmplusplus · Jan 28, 2019 · 7e32305 · 7e32305
1 parent d994dfc
commit 7e32305
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/util/pup.h b/src/util/pup.h
@@ -719,14 +719,14 @@ class able {
 #define PUPable_operator_inside(className)\
     friend inline void operator|(PUP::er &p,className &a) {a.pup(p);}\
     friend inline void operator|(PUP::er &p,className* &a) {\
-	PUP::able *pa=a;  p(&pa);  a=(className *)pa;\
+	PUP::able *pa=a;  p(&pa);  a=dynamic_cast<className *>(pa);\
     }
 
 //  Macros to be used outside a class body.
 #define PUPable_operator_outside(className)\
     inline void operator|(PUP::er &p,className &a) {a.pup(p);}\
     inline void operator|(PUP::er &p,className* &a) {\
-	PUP::able *pa=a;  p(&pa);  a=(className *)pa;\
+	PUP::able *pa=a;  p(&pa);  a=dynamic_cast<className *>(pa);\
     }
 
 //Declarations to include in a PUP::able's body.