Changeset 2228

Timestamp:

08/08/2008 22:50:28 (2 years ago)

Author:

chris

Message:

Replace manual pointer management with std::auto_ptr.

Files:

• box/trunk/lib/common/Configuration.cpp (modified) (4 diffs)

box/trunk/lib/common/Configuration.cpp

@@ -200 +200 @@
         
         // Object to create
-        Configuration *pconfig = new Configuration(std::string("<root>"));
+        std::auto_ptr<Configuration> apConfig(
+                new Configuration(std::string("<root>")));
         
         try
         {
                 // Load
-                LoadInto(*pconfig, getline, rErrorMsg, true);
+                LoadInto(*apConfig, getline, rErrorMsg, true);
 
                 if(!rErrorMsg.empty())
@@ -212 +213 @@
                         BOX_ERROR("Error in Configuration::LoadInto: " << 
                                 rErrorMsg);
-                        delete pconfig;
-                        pconfig = 0;
                         return std::auto_ptr<Configuration>(0);
                 }
@@ -220 +219 @@
                 if(pVerify)
                 {
-                        if(!Verify(*pconfig, *pVerify, std::string(), rErrorMsg))
+                        if(!Verify(*apConfig, *pVerify, std::string(),
+                                rErrorMsg))
                         {
                                 BOX_ERROR("Error verifying configuration: " <<
                                         rErrorMsg);
-                                delete pconfig;
-                                pconfig = 0;
                                 return std::auto_ptr<Configuration>(0);
                         }
@@ -233 +231 @@
         {
                 // Clean up
-                delete pconfig;
-                pconfig = 0;
                 throw;
         }
         
         // Success. Return result.
-        return std::auto_ptr<Configuration>(pconfig);
+        return apConfig;
 }