Some more code refactoring. Remove ungliness caused by references

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit e5c701977f1a · 2023-07-23T21:10:37.000+03:00
diff --git a/blobstamper/galley.cpp b/blobstamper/galley.cpp
@@ -70,7 +70,7 @@ GalleyVectorBin::ExtractBinVector(std::shared_ptr<Blob> blob)
 
   for(int i = 0; i<blobs.size(); i++)
   {
-    res[i] = b_stamp->ExtractBin(blobs[i]);
+    res[i] = std::dynamic_pointer_cast<StampBaseBin>(stamp)->ExtractBin(blobs[i]);
   }
   return res;
 }
diff --git a/blobstamper/galley.h b/blobstamper/galley.h
@@ -69,18 +69,16 @@ template<class T> class GalleyVectorStrStampBase:  public GalleyVectorStr, publi
 
 class GalleyVectorBin: public GalleyVectorBase
 {
-    std::shared_ptr<StampBaseBin> b_stamp;
   public:
-    GalleyVectorBin(std::shared_ptr<StampBaseBin> stamp_arg): GalleyVectorBase(stamp_arg), b_stamp(stamp_arg)  {};
+    GalleyVectorBin(std::shared_ptr<StampBaseBin> stamp_arg): GalleyVectorBase(stamp_arg) {};
     std::vector<std::vector<char>> ExtractBinVector(std::shared_ptr<Blob> blob);
 };
 
 
 template<class T> class GalleyVectorV: public GalleyVectorBase
 {
-    std::shared_ptr<StampBaseV<T>> v_stamp;
   public:
-    GalleyVectorV(std::shared_ptr<StampBaseV<T>> stamp_arg): GalleyVectorBase(stamp_arg), v_stamp(stamp_arg)  {};
+    GalleyVectorV(std::shared_ptr<StampBaseV<T>> stamp_arg): GalleyVectorBase(stamp_arg) {};
     std::vector<T> ExtractValuesVector(std::shared_ptr<Blob> blob);
 };
 
@@ -93,7 +91,7 @@ GalleyVectorV<T>::ExtractValuesVector(std::shared_ptr<Blob> blob)
 
   for(int i=0; i<blobs.size(); i++)
   {
-    res[i] = v_stamp->ExtractValue(blobs[i]);
+    res[i] = std::dynamic_pointer_cast<StampBaseV<T>>(stamp)->ExtractValue(blobs[i]);
   }
   return res;
 }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ GalleyVectorBin::ExtractBinVector(std::shared_ptr<Blob> blob)`
`70`	`70`
`71`	`71`	`for(int i = 0; i<blobs.size(); i++)`
`72`	`72`	`{`
`73`		`- res[i] = b_stamp->ExtractBin(blobs[i]);`
	`73`	`+ res[i] = std::dynamic_pointer_cast<StampBaseBin>(stamp)->ExtractBin(blobs[i]);`
`74`	`74`	`}`
`75`	`75`	`return res;`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,18 +69,16 @@ template<class T> class GalleyVectorStrStampBase: public GalleyVectorStr, publi`
`69`	`69`
`70`	`70`	`class GalleyVectorBin: public GalleyVectorBase`
`71`	`71`	`{`
`72`		`- std::shared_ptr<StampBaseBin> b_stamp;`
`73`	`72`	`public:`
`74`		`- GalleyVectorBin(std::shared_ptr<StampBaseBin> stamp_arg): GalleyVectorBase(stamp_arg), b_stamp(stamp_arg) {};`
	`73`	`+ GalleyVectorBin(std::shared_ptr<StampBaseBin> stamp_arg): GalleyVectorBase(stamp_arg) {};`
`75`	`74`	`std::vector<std::vector<char>> ExtractBinVector(std::shared_ptr<Blob> blob);`
`76`	`75`	`};`
`77`	`76`
`78`	`77`
`79`	`78`	`template<class T> class GalleyVectorV: public GalleyVectorBase`
`80`	`79`	`{`
`81`		`- std::shared_ptr<StampBaseV<T>> v_stamp;`
`82`	`80`	`public:`
`83`		`- GalleyVectorV(std::shared_ptr<StampBaseV<T>> stamp_arg): GalleyVectorBase(stamp_arg), v_stamp(stamp_arg) {};`
	`81`	`+ GalleyVectorV(std::shared_ptr<StampBaseV<T>> stamp_arg): GalleyVectorBase(stamp_arg) {};`
`84`	`82`	`std::vector<T> ExtractValuesVector(std::shared_ptr<Blob> blob);`
`85`	`83`	`};`
`86`	`84`
`@@ -93,7 +91,7 @@ GalleyVectorV<T>::ExtractValuesVector(std::shared_ptr<Blob> blob)`
`93`	`91`
`94`	`92`	`for(int i=0; i<blobs.size(); i++)`
`95`	`93`	`{`
`96`		`- res[i] = v_stamp->ExtractValue(blobs[i]);`
	`94`	`+ res[i] = std::dynamic_pointer_cast<StampBaseV<T>>(stamp)->ExtractValue(blobs[i]);`
`97`	`95`	`}`
`98`	`96`	`return res;`
`99`	`97`	`}`