Replaced a pointer-centered try/catch block with std::auto_ptr

src/map.cpp

@@ -5,6 +5,7 @@
 #include "token.h"
 #include "exceptions.h"
 #include <iostream>
+#include <memory>
 
 namespace YAML
 {
@@ -66,10 +67,8 @@ namespace YAML
 			if(token.type == TT_BLOCK_END)
 				break;
 
-			Node *pKey = new Node;
-			Node *pValue = new Node;
+			std::auto_ptr <Node> pKey(new Node), pValue(new Node);
 
-			try {
 			// grab key
 			pKey->Parse(pScanner, state);
 
@@ -79,12 +78,8 @@ namespace YAML
 				pValue->Parse(pScanner, state);
 			}
 
-				m_data[pKey] = pValue;
-			} catch(Exception&) {
-				delete pKey;
-				delete pValue;
-				throw;
-			}
+			// assign the map with the actual pointers
+			m_data[pKey.release()] = pValue.release();
 		}
 	}
 
@@ -110,10 +105,8 @@ namespace YAML
 
 			pScanner->pop();
 
-			Node *pKey = new Node;
-			Node *pValue = new Node;
+			std::auto_ptr <Node> pKey(new Node), pValue(new Node);
 
-			try {
 			// grab key
 			pKey->Parse(pScanner, state);
 
@@ -130,13 +123,8 @@ namespace YAML
 			else if(nextToken.type != TT_FLOW_MAP_END)
 				throw ParserException(nextToken.line, nextToken.column, ErrorMsg::END_OF_MAP_FLOW);
 
-				m_data[pKey] = pValue;
-			} catch(Exception&) {
-				// clean up and rethrow
-				delete pKey;
-				delete pValue;
-				throw;
-			}
+			// assign the map with the actual pointers
+			m_data[pKey.release()] = pValue.release();
 		}
 	}