Merge pull request #562 from ipconfigme/master

- rename build to bld in doc, make Mac build ok when case sensitive

build_in_travis_ci.sh

@@ -36,7 +36,7 @@ else
 fi
 
 echo "start building by cmake"
-rm -rf build && mkdir build && cd build
+rm -rf bld && mkdir bld && cd bld
 if [ "$PURPOSE" = "compile" ]; then
     if ! cmake ..; then
         echo "Fail to generate Makefile by cmake"

docs/cn/getting_started.md

@@ -78,7 +78,7 @@ $ sh run_tests.sh
 
 ### Compile brpc with cmake
 ```shell
-mkdir build && cd build && cmake .. && make
+mkdir bld && cd bld && cmake .. && make
 ```
 To change compiler to clang, overwrite environment variable CC and CXX to clang and clang++.
 
@@ -91,7 +91,7 @@ To enable [thrift support](../en/thrift.md), install thrift first and add `-DWIT
 **Run example with cmake**
 ```shell
 $ cd example/echo_c++
-$ mkdir build && cd build && cmake .. && make
+$ mkdir bld && cd bld && cmake .. && make
 $ ./echo_server &
 $ ./echo_client
 ```
@@ -99,7 +99,7 @@ Examples link brpc statically, if you need to link the shared version, use `cmak
 
 **Run tests**
 ```shell
-$ mkdir build && cd build && cmake -DBUILD_UNIT_TESTS=ON .. && make
+$ mkdir bld && cd bld && cmake -DBUILD_UNIT_TESTS=ON .. && make
 $ cd test
 $ sh run_tests.sh
 ```
@@ -169,7 +169,7 @@ $ sh run_tests.sh
 
 ### Compile brpc with cmake
 ```shell
-mkdir build && cd build && cmake .. && make
+mkdir bld && cd bld && cmake .. && make
 ```
 To change compiler to clang, overwrite environment variable CC and CXX to clang and clang++.
 
@@ -183,7 +183,7 @@ To enable [thrift support](../en/thrift.md), install thrift first and add `-DWIT
 
 ```shell
 $ cd example/echo_c++
-$ mkdir build && cd build && cmake .. && make
+$ mkdir bld && cd bld && cmake .. && make
 $ ./echo_server &
 $ ./echo_client
 ```
@@ -191,7 +191,7 @@ Examples link brpc statically, if you need to link the shared version, use `cmak
 
 **Run tests**
 ```shell
-$ mkdir build && cd build && cmake -DBUILD_UNIT_TESTS=ON .. && make
+$ mkdir bld && cd bld && cmake -DBUILD_UNIT_TESTS=ON .. && make
 $ cd test
 $ sh run_tests.sh
 ```
@@ -242,7 +242,7 @@ $ make
 git clone brpc. cd into the repo and run
 
 ```shell
-mkdir build && cd build && cmake -DCMAKE_INCLUDE_PATH="/path/to/dep1/include;/path/to/dep2/include" -DCMAKE_LIBRARY_PATH="/path/to/dep1/lib;/path/to/dep2/lib" .. && make
+mkdir bld && cd bld && cmake -DCMAKE_INCLUDE_PATH="/path/to/dep1/include;/path/to/dep2/include" -DCMAKE_LIBRARY_PATH="/path/to/dep1/lib;/path/to/dep2/lib" .. && make
 ```
 
 To change compiler to clang, overwrite environment variable CC and CXX to clang and clang++.
@@ -276,7 +276,7 @@ brew install gperftools
 
 If you need to run tests, install and compile googletest (which is not compiled yet):
 ```shell
-git clone https://github.com/google/googletest && cd googletest/googletest && mkdir build && cd build && cmake .. && make && sudo mv libgtest* /usr/lib/ && cd -
+git clone https://github.com/google/googletest && cd googletest/googletest && mkdir bld && cd bld && cmake .. && make && sudo mv libgtest* /usr/lib/ && cd -
 ```
 
 ### Compile brpc with config_brpc.sh
@@ -311,7 +311,7 @@ $ sh run_tests.sh
 
 ### Compile brpc with cmake
 ```shell
-mkdir build && cd build && cmake .. && make
+mkdir bld && cd bld && cmake .. && make
 ```
 
 To not link debugging symbols, use `cmake -DWITH_DEBUG_SYMBOLS=OFF ..` and compiled binaries will be much smaller.
@@ -323,7 +323,7 @@ To enable [thrift support](../en/thrift.md), install thrift first and add `-DWIT
 **Run example with cmake**
 ```shell
 $ cd example/echo_c++
-$ mkdir build && cd build && cmake .. && make
+$ mkdir bld && cd bld && cmake .. && make
 $ ./echo_server &
 $ ./echo_client
 ```
@@ -331,7 +331,7 @@ Examples link brpc statically, if you need to link the shared version, use `cmak
 
 **Run tests**
 ```shell
-$ mkdir build && cd build && cmake -DBUILD_UNIT_TESTS=ON .. && make
+$ mkdir bld && cd bld && cmake -DBUILD_UNIT_TESTS=ON .. && make
 $ cd test
 $ sh run_tests.sh
 ```

docs/cn/thrift.md

@@ -33,7 +33,7 @@ sh config_brpc.sh --headers=/usr/include --libs=/usr/lib --with-thrift
 # Fedora/CentOS
 sh config_brpc.sh --headers=/usr/include --libs=/usr/lib64 --with-thrift
 # Or use cmake
-mkdir build && cd build && cmake ../ -DWITH_THRIFT=1
+mkdir bld && cd bld && cmake ../ -DWITH_THRIFT=1
 ```
 更多编译选项请阅读[Getting Started](../cn/getting_started.md)。
 

docs/en/thrift.md

@@ -33,7 +33,7 @@ sh config_brpc.sh --headers=/usr/include --libs=/usr/lib --with-thrift
 # Fedora/CentOS
 sh config_brpc.sh --headers=/usr/include --libs=/usr/lib64 --with-thrift
 # Or use cmake
-mkdir build && cd build && cmake ../ -DWITH_THRIFT=ON
+mkdir bld && cd bld && cmake ../ -DWITH_THRIFT=ON
 ```
 Read [Getting Started](../cn/getting_started.md) for more compilation options.
 

src/butil/containers/linked_list.h

@@ -30,7 +30,7 @@
 //
 //   list.Append(n1);
 //   list.Append(n3);
-//   n3->InsertBefore(n3);
+//   n2->InsertBefore(n3);
 //
 // Lastly, to iterate through the linked list forwards:
 //