Updated cpp07 files with new subject

2 files changed, 20 insertions, 44 deletions

diff --git a/cpp07/ex02/Array.hpp b/cpp07/ex02/Array.hpp
index fec8698..0dc53c4 100644
--- a/cpp07/ex02/Array.hpp
+++ b/cpp07/ex02/Array.hpp
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/14 20:14:07 by charles           #+#    #+#             */
-/*   Updated: 2020/04/14 20:41:25 by charles          ###   ########.fr       */
+/*   Updated: 2020/12/14 15:26:51 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,31 +19,30 @@ template<typename T>
 class Array
 {
 public:
-    Array() : m_under(new T[0]), m_size(0)
-    {}
+    Array()
+        : m_under(new T[0]), m_size(0) {}
 
-    Array(unsigned int n) : m_under(new T[n]()), m_size(n)
-    {}
+    Array(unsigned int n)
+        : m_under(new T[n]()), m_size(n) {}
 
-    Array(Array const& other) : m_under(new T[other.m_size]), m_size(other.m_size)
+    Array(Array const& other)
+        : m_under(new T[other.m_size]), m_size(other.m_size)
     {
         for (unsigned int i = 0; i < m_size; i++)
             m_under[i] = other.m_under[i];
     }
 
-    void operator=(Array const& other)
+    Array& operator=(Array const& other)
     {
         delete [] m_under;
-        m_size = other.m_size;
+        m_size  = other.m_size;
         m_under = new T[m_size];
         for (unsigned int i = 0; i < m_size; i++)
             m_under[i] = other.m_under[i];
+        return *this;
     }
 
-    ~Array()
-    {
-        delete [] m_under;
-    }
+    ~Array() { delete [] m_under; }
 
     T& operator[](unsigned int n)
     {
@@ -59,13 +58,10 @@ public:
         return m_under[n];
     }
 
-    unsigned int size() const
-    {
-        return m_size;
-    }
+    unsigned int size() const { return m_size; }
 
 private:
-    T* m_under;
+    T*           m_under;
     unsigned int m_size;
 };
 
diff --git a/cpp07/ex02/main.cpp b/cpp07/ex02/main.cpp
index 251d697..2f53f00 100644
--- a/cpp07/ex02/main.cpp
+++ b/cpp07/ex02/main.cpp
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/14 20:25:44 by charles           #+#    #+#             */
-/*   Updated: 2020/04/14 20:41:40 by charles          ###   ########.fr       */
+/*   Updated: 2020/12/14 15:29:50 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,14 +17,8 @@ int main()
 {
     Array<int> a;
     std::cout << a.size() << std::endl;
-    try
-    {
-        std::cout << a[0] << std::endl;
-    }
-    catch (std::exception e)
-    {
-        std::cout << e.what() << std::endl;
-    }
+    try                      { std::cout << a[0] << std::endl;     }
+    catch (std::exception e) { std::cout << e.what() << std::endl; }
     std::cout << "------------------------" << std::endl;
 
     Array<int> b(3);
@@ -34,14 +28,8 @@ int main()
     b[1] = 2;
     b[2] = 3;
     std::cout << b[0] << ", " << b[1] << ", " << b[2] << std::endl;
-    try
-    {
-        std::cout << b[3] << std::endl;
-    }
-    catch (std::exception e)
-    {
-        std::cout << e.what() << std::endl;
-    }
+    try                      { std::cout << b[3] << std::endl;     }
+    catch (std::exception e) { std::cout << e.what() << std::endl; }
     std::cout << "------------------------" << std::endl;
 
     Array<float> c(3);
@@ -50,14 +38,8 @@ int main()
     c[1] = 2.2;
     c[2] = 3.1;
     std::cout << c[0] << ", " << c[1] << ", " << c[2] << std::endl;
-    try
-    {
-        std::cout << c[3] << std::endl;
-    }
-    catch (std::exception e)
-    {
-        std::cout << e.what() << std::endl;
-    }
+    try                      { std::cout << c[3] << std::endl;     }
+    catch (std::exception e) { std::cout << e.what() << std::endl; }
     std::cout << "------------------------" << std::endl;
 
     Array<float> d(c);
@@ -76,6 +58,4 @@ int main()
     std::cout << f[0] << " <> " << c[0] << std::endl;
     std::cout << f[1] << " <> " << c[1] << std::endl;
     std::cout << f[2] << " <> " << c[2] << std::endl;
-
-    return 0;
 }