Merge remote-tracking branch 'refs/remotes/Mooophy/master'

khal01 · Apr 19, 2016 · 94aa784 · 94aa784
2 parents 64869b6 + 60875a8
commit 94aa784
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/ch11/README.md b/ch11/README.md
@@ -113,14 +113,7 @@ const string& transform(const string &s, const map<string, string> &m)
     return m[s];
 }
 ```
-Such code could be explained as following pseudocode:
-```python
-    if m contains key s:
-        return m[s]
-    else:
-        insert pair {s, ""} into m
-        return m[s]     // That is an empty string
-```
+The above code won't compile because the subscript operator might insert an element (when the element with the key s is not found), and we may use subscript only on a map that is not const.
 
 ## Exercise 11.35:
 >In buildMap, what effect, if any, would there be from rewriting `trans_map[key] = value.substr(1);` as `trans_map.insert({ key, value.substr(1) })`?

diff --git a/ch13/ex13_17_2.cpp b/ch13/ex13_17_2.cpp
@@ -26,7 +26,7 @@ class numbered {
     static int unique;
 };
 
-static int unique = 10;
+int numbered::unique = 10;
 
 void f(numbered s) {
     std::cout << s.mysn << std::endl;