File tree 3 files changed +4
-5
lines changed
3 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -2,15 +2,16 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
2
2
PROJECT (libslave)
3
3
4
4
# Build flags
5
- IF (CMAKE_COMPILER_IS_GNUCC)
5
+ IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
6
+ OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
6
7
# Common options
7
8
ADD_DEFINITIONS (-pipe)
8
9
ADD_DEFINITIONS (-Wall)
9
10
ADD_DEFINITIONS (-O2)
10
11
ADD_DEFINITIONS (-std=c++11)
11
12
ADD_DEFINITIONS (-DUSE_PSI_1)
12
13
ADD_DEFINITIONS (-DHAVE_PSI_1)
13
- ENDIF (CMAKE_COMPILER_IS_GNUCC )
14
+ ENDIF ()
14
15
15
16
FIND_PACKAGE (Boost REQUIRED)
16
17
INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS} )
Original file line number Diff line number Diff line change @@ -1025,8 +1025,6 @@ void Slave::generateSlaveId()
1025
1025
1026
1026
while (1 ) {
1027
1027
1028
- if (serveroid < 0 ) serveroid = -serveroid;
1029
-
1030
1028
if (server_ids.count (serveroid) != 0 ) {
1031
1029
serveroid++;
1032
1030
} else {
Original file line number Diff line number Diff line change 6
6
7
7
namespace nanomysql
8
8
{
9
- struct Connection ;
9
+ class Connection ;
10
10
}
11
11
12
12
namespace slave
You can’t perform that action at this time.
0 commit comments