plist->p_list

panda/src/putil/test_bam.cxx

@@ -82,10 +82,10 @@ fillin(Person* me, DatagramIterator& scan, BamReader* manager)
 }
 
 int Person::
-complete_pointers(vector_typedWritable& plist, BamReader *)
+complete_pointers(vector_typedWritable& p_list, BamReader *)
 {
-  _bro = (plist[0] == TypedWritable::Null) ? (Person*)NULL : DCAST(Person, plist[0]);
-  _sis = (plist[1] == TypedWritable::Null) ? (Person*)NULL : DCAST(Person, plist[1]);
+  _bro = (p_list[0] == TypedWritable::Null) ? (Person*)NULL : DCAST(Person, p_list[0]);
+  _sis = (p_list[1] == TypedWritable::Null) ? (Person*)NULL : DCAST(Person, p_list[1]);
   return 2;
 }
 
@@ -127,11 +127,11 @@ fillin(Parent* me, DatagramIterator& scan, BamReader* manager)
 }
 
 int Parent::
-complete_pointers(vector_typedWritable& plist, BamReader *manager)
+complete_pointers(vector_typedWritable& p_list, BamReader *manager)
 {
-  int start = Person::complete_pointers(plist, manager);
-  _son = (plist[start] == TypedWritable::Null) ? (Child*)NULL : DCAST(Child, plist[2]);
-  _daughter = (plist[start+1] == TypedWritable::Null) ? (Child*)NULL : DCAST(Child, plist[3]);
+  int start = Person::complete_pointers(p_list, manager);
+  _son = (p_list[start] == TypedWritable::Null) ? (Child*)NULL : DCAST(Child, p_list[2]);
+  _daughter = (p_list[start+1] == TypedWritable::Null) ? (Child*)NULL : DCAST(Child, p_list[3]);
   return start+2;
 }
 
@@ -187,11 +187,11 @@ fillin(Child* me, DatagramIterator& scan, BamReader* manager)
 }
 
 int Child::
-complete_pointers(vector_typedWritable& plist, BamReader *manager)
+complete_pointers(vector_typedWritable& p_list, BamReader *manager)
 {
-  int start = Person::complete_pointers(plist, manager);
-  _dad = (plist[start] == TypedWritable::Null) ? (Parent*)NULL : DCAST(Parent, plist[2]);
-  _mom = (plist[start+1] == TypedWritable::Null) ? (Parent*)NULL : DCAST(Parent, plist[3]);
+  int start = Person::complete_pointers(p_list, manager);
+  _dad = (p_list[start] == TypedWritable::Null) ? (Parent*)NULL : DCAST(Parent, p_list[2]);
+  _mom = (p_list[start+1] == TypedWritable::Null) ? (Parent*)NULL : DCAST(Parent, p_list[3]);
   return start+2;
 }
 

panda/src/putil/test_bam.h

@@ -38,7 +38,7 @@ public:
   void write_datagram(BamWriter*, Datagram&);
 
   static TypedWritable *make_person(const FactoryParams &params);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 protected:
   void fillin(Person*,DatagramIterator&,BamReader*);
@@ -93,7 +93,7 @@ public:
   void write_datagram(BamWriter*, Datagram&);
 
   static TypedWritable *make_parent(const FactoryParams &params);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 protected:
   void fillin(Parent*,DatagramIterator&,BamReader*);
@@ -139,7 +139,7 @@ public:
   void write_datagram(BamWriter*, Datagram&);
 
   static TypedWritable *make_child(const FactoryParams &params);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 protected:
   void fillin(Child*,DatagramIterator&,BamReader*);

panda/src/putil/typedWritable.C.template

@@ -39,9 +39,9 @@ fillin(DatagramIterator& scan, BamReader* manager)
 //               pointers that this object made to BamReader.
 ////////////////////////////////////////////////////////////////////
 int Generic::
-complete_pointers(vector_typedWriteable &plist, BamReader *manager)
+complete_pointers(vector_typedWriteable &p_list, BamReader *manager)
 {
-  int start = GenericParent::complete_pointers(plist, manager);
+  int start = GenericParent::complete_pointers(p_list, manager);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/putil/typedWritable.h

@@ -64,7 +64,7 @@ public:
   //Return the number of pointers read.  This is useful for when
   //a parent reads in a variable number of pointers, so the child
   //knows where to start reading from.
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 

panda/src/putil/typedWritable.h.template

@@ -7,8 +7,8 @@ class BamReader;
 public:
   static void register_with_read_factory(void);
   virtual void write_datagram(BamWriter* manager, Datagram &me);  
-  virtual int complete_pointers(vector_typedWriteable &plist, 
-				BamReader *manager);
+  virtual int complete_pointers(vector_typedWriteable &p_list, 
+                                BamReader *manager);
   virtual void finalize(void);
 
   static TypedWriteable *make_Generic(const FactoryParams &params);

panda/src/putil/writable.h

@@ -58,7 +58,7 @@ public:
   //Return the number of pointers read.  This is useful for when
   //a parent reads in a variable number of pointers, so the child
   //knows where to start reading from.
-  //virtual int complete_pointers(vector_typedWritable &plist,
+  //virtual int complete_pointers(vector_typedWritable &p_list,
   //                              BamReader *manager) {}