From 3ae20ae6213e853d42c6b564c61b1eb76a01335c Mon Sep 17 00:00:00 2001
From: Light-City <455954986@qq.com>
Date: Mon, 9 Dec 2019 11:14:25 +0800
Subject: [PATCH] update

---
 README.md                                     |   3 +-
 morden_C++_30/.CMakeLists.txt.un~             | Bin 0 -> 861 bytes
 morden_C++_30/CMakeLists.txt                  |   6 ++--
 morden_C++_30/CMakeLists.txt~                 |  17 ++++++++++++
 .../RAII/{heap_stack.cpp => heap.cpp}         |   0
 morden_C++_30/RAII/stack.cpp                  |  26 ++++++++++++++++++
 6 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 morden_C++_30/.CMakeLists.txt.un~
 create mode 100644 morden_C++_30/CMakeLists.txt~
 rename morden_C++_30/RAII/{heap_stack.cpp => heap.cpp} (100%)
 create mode 100644 morden_C++_30/RAII/stack.cpp

diff --git a/README.md b/README.md
index 9c55347..fd1cf18 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,8 @@ for(decl:col) {
 #### 3.1 [极客时间《现代C++实战30讲》](https://time.geekbang.org/channel/home)
 
 - [堆、栈、RAII：C++里该如何管理资源？](./morden_C++_30)
-  - [堆与栈](./morden_C++_30/RAII/heap_stack.cpp)
+  - [堆](./morden_C++_30/RAII/heap.cpp)
+  - [栈](./morden_C++_30/RAII/stack.cpp)
   - [RAII](./morden_C++_30/RAII/RAII.cpp)
 
 ### 4.代码运行
diff --git a/morden_C++_30/.CMakeLists.txt.un~ b/morden_C++_30/.CMakeLists.txt.un~
new file mode 100644
index 0000000000000000000000000000000000000000..30ba01b3152a8d025642af325126c58c7c738a58
GIT binary patch
literal 861
zcmWH`%$*;a=aT=Ffk}X~F6pGlO0(|HeeE*(F1s`Zzk2Q~a#Qru*Y*s$oVtO5fq@f<
zkpUx+1HvExV}tpzZ+Aanfr!LkfXJheASqUu$bTS!8v_#@rHKy#ct`@Z@E~amgRz0p
zaUU8TUnPKoEI<s?!~tZpD=Q@B=NFd%nR>;kB^plt{=p&fo_@|gp)RiRE}lUO`WgAT
zsrosY=@}*ZNyR1lnR&@Mr75YJKppA`9X_6Z-dL6AWF~=>f`GTO!qdLpPbaT>+1~T4
zbKlb?Tb@m8f3ka<!t>cXp6;FeWLIB$a<YDMPGVlV!jm0qpU-O1_0-4&QcssGf7&+l
z>DuYf*7s^Y?QeQE6_g}3p)QF}$t+4uF3B&-OfA+>smAa@Ey#XnG`n|AhT5%HoUfpl
jl9K}@DuHfAaSO~9K5#pgb29U?v04ZVfLcw{#^<X5Q9!Nc

literal 0
HcmV?d00001

diff --git a/morden_C++_30/CMakeLists.txt b/morden_C++_30/CMakeLists.txt
index 89ccccb..d92457e 100644
--- a/morden_C++_30/CMakeLists.txt
+++ b/morden_C++_30/CMakeLists.txt
@@ -3,5 +3,7 @@ project(Morden_C++)
 
 set(CMAKE_CXX_STANDARD 11)
 
-add_executable(heap_stack_RAII RAII/heap_stack.cpp)
-add_executable(RAII RAII/RAII.cpp)
\ No newline at end of file
+add_executable(heap RAII/heap.cpp)
+add_executable(stack RAII/stack.cpp)
+add_executable(RAII RAII/RAII.cpp)
+add_executable(auto_ptr smart_ptr/auto_ptr.cpp)
diff --git a/morden_C++_30/CMakeLists.txt~ b/morden_C++_30/CMakeLists.txt~
new file mode 100644
index 0000000..c4ca5fc
--- /dev/null
+++ b/morden_C++_30/CMakeLists.txt~
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.14)
+project(Morden_C++)
+
+set(CMAKE_CXX_STANDARD 11)
+# boost
+set(BOOST_INCLUDE_DIR /home/light/bst/include)
+set(BOOST_LINK_DIR /home/light/bst/lib)
+
+# 去哪里找头文件 相当于gcc/clang 中的-I(i的大写字母)参数
+include_directories(${BOOST_INCLUDE_DIR})
+# 去哪里找库文件 .so .dll .dylib 相当于gcc 中的-L参数
+link_directories(${BOOST_LINK_DIR})
+
+add_executable(heap RAII/heap.cpp)
+add_executable(stack RAII/stack.cpp)
+add_executable(RAII RAII/RAII.cpp)
+add_executable(auto_ptr smart_ptr/auto_ptr.cpp)
diff --git a/morden_C++_30/RAII/heap_stack.cpp b/morden_C++_30/RAII/heap.cpp
similarity index 100%
rename from morden_C++_30/RAII/heap_stack.cpp
rename to morden_C++_30/RAII/heap.cpp
diff --git a/morden_C++_30/RAII/stack.cpp b/morden_C++_30/RAII/stack.cpp
new file mode 100644
index 0000000..4ae9b6f
--- /dev/null
+++ b/morden_C++_30/RAII/stack.cpp
@@ -0,0 +1,26 @@
+//
+// Created by light on 19-12-9.
+//
+#include <iostream>
+class Obj {
+public:
+    Obj() { puts("Obj()"); }
+    ~Obj() { puts("~Obj()"); }
+};
+void foo(int n)
+{
+    Obj obj;
+    if (n == 42)
+        throw "life, the universe and everything";
+}
+// 不管是否发生了异常，obj 的析构函数都会得到执行。
+int main()
+{
+    try {
+        foo(41);
+        foo(42);
+    }
+    catch (const char* s) {
+        puts(s);
+    }
+}