移去virtual函数

senlinzhan · Aug 10, 2015 · 51db252 · 51db252
1 parent 8638453
commit 51db252
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/avl_tree.hpp b/avl_tree.hpp
@@ -256,7 +256,7 @@ class avl_tree
     }
 
     // call root_'s destructor, all nodes' memory will be free 
-    virtual ~avl_tree() = default;
+    ~avl_tree() = default;
 
     void swap( avl_tree &tree ) noexcept 
     {

diff --git a/binary_tree.hpp b/binary_tree.hpp
@@ -1,7 +1,6 @@
 /***
     二叉搜索树
         1. 使用智能指针自动管理内存
-        2. 使用虚析构函数，允许定义 binary_tree 的派生类
         3. 引入异常，对于不合法的操作会抛出异常
         4. 支持输入迭代器
 
@@ -244,7 +243,7 @@ class binary_tree
     }
 
     // call root_'s destructor, all nodes' memory will be free 
-    virtual ~binary_tree() = default;
+    ~binary_tree() = default;
 
     void swap( binary_tree &tree ) noexcept 
     {

diff --git a/forward_list.hpp b/forward_list.hpp
@@ -1,7 +1,6 @@
 /***
     单向链表
         1. 使用智能指针自动管理内存
-        2. 使用虚析构函数，允许定义 forward_list 的派生类
         3. 引入异常，对于不合法的操作会抛出异常
         4. 不允许使用 allocator 来分配内存
 
@@ -234,7 +233,7 @@ class forward_list
     /**
        call head_'s destructor, all nodes' memory will be free 
     **/
-    virtual ~forward_list() = default;
+    ~forward_list() = default;
 
     /**
        can handle the problem of self-assignment, see C++ Primer 5th section 13.3

diff --git a/list.hpp b/list.hpp
@@ -280,7 +280,7 @@ class list
     }
 
     // call head_'s destructor, all nodes' memory will be free 
-    virtual ~list() = default;
+    ~list() = default;
 
     void swap( list &other ) noexcept 
     {

diff --git a/priority_queue.hpp b/priority_queue.hpp
@@ -74,6 +74,8 @@ class priority_queue
         mystl::make_heap( container_.begin(), container_.end(), comp_ );
     }
 
+    ~priority_queue() = default;
+
     bool empty() const 
     {
         return container_.empty();

diff --git a/queue.hpp b/queue.hpp
@@ -60,7 +60,7 @@ class queue
     {    
     }
 
-    virtual ~queue() = default;
+    ~queue() = default;
 
     bool empty() const
     {

diff --git a/unordered_set.hpp b/unordered_set.hpp
@@ -214,7 +214,7 @@ class unordered_set
         swap( other );
     }
 
-    virtual ~unordered_set() = default;
+    ~unordered_set() = default;
 
     unordered_set &operator=( const unordered_set &other ) 
     {

diff --git a/vector.hpp b/vector.hpp
@@ -148,7 +148,7 @@ class vector
         assign( lst.begin(), lst.end() );
     }
 
-    virtual ~vector() 
+    ~vector() 
     {
         clear_elements();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ class queue @@
         {
         }
-        virtual ~queue() = default;
+        ~queue() = default;
         bool empty() const
         {
@@ Expand Down @@