remove -init_make_config

build_in_travis_ci.sh

@@ -21,7 +21,6 @@ runcmd(){
 
 echo "build combination: PURPOSE=$PURPOSE CXX=$CXX CC=$CC"
 
-init_make_config() {
 EXTRA_BUILD_OPTS=""
 if [ "$USE_MESALINK" = "yes" ]; then
     EXTRA_BUILD_OPTS="$EXTRA_BUILD_OPTS --with-mesalink"
@@ -31,13 +30,10 @@ if ! sh config_brpc.sh --headers=/usr/include --libs=/usr/lib --nodebugsymbols -
     echo "Fail to configure brpc"
     exit 1
 fi
-}
 
 if [ "$PURPOSE" = "compile" ]; then
-    init_make_config
     make -j4 && sh tools/make_all_examples
 elif [ "$PURPOSE" = "unittest" ]; then
-    init_make_config
     cd test
     make -j4 && sh ./run_tests.sh
 elif [ "$PURPOSE" = "compile-with-cmake" ]; then

src/brpc/cluster_recover_policy.h

@@ -25,7 +25,7 @@
 
 namespace brpc {
 
-class ServerId;
+struct ServerId;
 
 // After all servers are down and health check happens, servers are
 // online one by one. Once one server is up, all the request that should