Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / plugins / other / rscript / nrmap_parser.h

diff --git a/projects/stargazer/plugins/other/rscript/nrmap_parser.h b/projects/stargazer/plugins/other/rscript/nrmap_parser.h
index 82c6fe31be435e75f51dd0355ad2429f0f559024..240ce349b6d12a0d74e66e876b99122db3e90f21 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/nrmap_parser.h
+++ b/projects/stargazer/plugins/other/rscript/nrmap_parser.h
@@ -34,20 +34,39 @@
 
 struct NET_ROUTER
 {
 
 struct NET_ROUTER
 {

-uint32_t              subnetIP;
-uint32_t              subnetMask;
-std::vector<uint32_t> routers;
+    NET_ROUTER() : subnetIP(0), subnetMask(0), routers() {}
+    NET_ROUTER(const NET_ROUTER & rvalue)
+        : subnetIP(rvalue.subnetIP),
+          subnetMask(rvalue.subnetMask),
+          routers(rvalue.routers)
+    {}
+
+    uint32_t              subnetIP;
+    uint32_t              subnetMask;
+    std::vector<uint32_t> routers;
+
+    NET_ROUTER & operator=(const NET_ROUTER & rvalue)
+    {
+    subnetIP = rvalue.subnetIP;
+    subnetMask = rvalue.subnetMask;
+    routers = rvalue.routers;
+    return *this;
+    }

 };
 
 class NRMapParser {
 public:
 };
 
 class NRMapParser {
 public:

-    NRMapParser();
-    ~NRMapParser();
+    NRMapParser() : nrmap(), errorStr() {}
+    ~NRMapParser() {}

 
     bool ReadFile(const std::string & fileName);
 
     bool ReadFile(const std::string & fileName);

-    const std::vector<NET_ROUTER> & GetMap() const { return nrmap; };
-    const std::string & GetErrorStr() const { return errorStr; };
+    const std::vector<NET_ROUTER> & GetMap() const { return nrmap; }
+    const std::string & GetErrorStr() const { return errorStr; }
+

 private:
 private:

+    NRMapParser(const NRMapParser & rvalue);
+    NRMapParser & operator=(const NRMapParser & rvalue);
+

     std::vector<NET_ROUTER> nrmap;
     mutable std::string errorStr;
 
     std::vector<NET_ROUTER> nrmap;
     mutable std::string errorStr;