Smart Pointers Fixed

Author: Lonelind

SmartPointers/SmartPointers.cpp

@@ -3,15 +3,14 @@
 #include "auto_ptr.hpp"
 
 // Sample object
-class object {
+class object 
+{
 public:
 	int x;
 
 	object(int t = 0) { x = t; }	
 };
 
-
-
 int main () 
 {
 	int * arrrr = new int[14];

SmartPointers/auto_ptr.hpp

@@ -10,33 +10,24 @@ class auto_ptr
 	deleter <T> del;
 
 public:
-    explicit auto_ptr (T * p = 0) 
-    { 
-	    ptr = p; 
-	}
-    
-    explicit auto_ptr (T * p, const deleter <T> & d) 
-    { 
-	    ptr = p; 
-	    del = d; 
+	explicit auto_ptr (T * p, const deleter <T> & d) : ptr (p), del (d) { }
+	
+	~auto_ptr() 
+	{
+		if (!isNull())
+		{
+			std::cout << "At address " << this; 		
+			del(ptr);
+		}
 	}
-    
-    ~auto_ptr() 
-    {
-    	if (!isNull())
-    	{
-    		std::cout << "At address " << this;    	
-    		del(ptr);
-    	}
-    }
 
 	auto_ptr(auto_ptr <T> & p) 
 	{
 		if (!isNull()) 
-	    {
-    		std::cout << "At address " << &p;    	
-	      	p.del(p.ptr);
-	    }
+		{
+			std::cout << "At address " << &p;		
+		  	p.del(p.ptr);
+		}
 		ptr = p.pointer();
   		p.ptr = 0; 
 	}
@@ -45,32 +36,32 @@ class auto_ptr
 	{
 		if (this != &p) 
 		{
-		    if (!isNull()) 
-		    {
-	    		std::cout << "At address " << this;    	
-		      	del(ptr);
-		    }
-		    ptr = p.pointer();
-		    p.ptr = 0;    
+			if (!isNull()) 
+			{
+				std::cout << "At address " << this;		
+			  	del(ptr);
+			}
+			ptr = p.pointer();
+			p.ptr = 0;	
   		}
   		return *this;
 	}
 
-    T & operator * () const 
-    { 
-	    return *ptr; 
+	T & operator * () const 
+	{ 
+		return *ptr; 
 	}
 
-    T * operator -> () const 
-    { 
-	    return ptr; 
+	T * operator -> () const 
+	{ 
+		return ptr; 
 	}
-    
-    T * pointer () const 
-    { 
-	    return ptr; 
+	
+	T * pointer () const 
+	{ 
+		return ptr; 
 	}
-     
+	 
 	bool isNull () const 
 	{ 
 		return ptr == 0; 

SmartPointers/scoped_ptr.hpp

@@ -6,48 +6,40 @@ template <class T>
 class scoped_ptr 
 {
 private:
-	explicit scoped_ptr (const scoped_ptr <T> & p) { } // call not permitted
-	scoped_ptr <T> & operator = (const scoped_ptr <T> & p) const { } // call not permitted
+	scoped_ptr (const scoped_ptr <T> & p) throw (); // call not permitted
+
+	scoped_ptr <T> & operator = (const scoped_ptr <T> & p) const throw (); // call not permitted
 
 	T * ptr;
 	deleter <T> del;
 
 public:
-    explicit scoped_ptr (T * p = 0) 
-    { 
-	    ptr = p; 
-	}
-
-    explicit scoped_ptr (T * p, const deleter <T> & d) 
-    { 
-	    ptr = p; 
-	    del = d; 
+	explicit scoped_ptr (T * p, const deleter <T> & d) : ptr (p), del (d) { }
+
+	~scoped_ptr() 
+	{
+		if (!isNull())
+		{
+			std::cout << "At address " << this;
+			del (ptr);
+		}
 	}
 
-    ~scoped_ptr() 
-    {
-    	if (!isNull())
-    	{
-    		std::cout << "At address " << this;
-    		del (ptr);
-    	}
-    }
-
-    T & operator * () const 
-    { 
-	    return *ptr; 
+	T & operator * () const 
+	{ 
+		return *ptr; 
 	}
 
-    T * operator -> () const 
-    { 
-	    return ptr; 
+	T * operator -> () const 
+	{ 
+		return ptr; 
 	}
 
-    T * pointer () const 
-    { 
-	    return ptr; 
+	T * pointer () const 
+	{ 
+		return ptr; 
 	}
-     
+	 
 	bool isNull () const 
 	{ 
 		return ptr == 0;