Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix for clang 3.4

  • Loading branch information...
commit 4f7aaf3056acc16d52534838e88f79bed895795f 1 parent c53f0ff
@chenshuo authored
View
14 clang.diff
@@ -1,7 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a3066c5..9728303 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -15,6 +15,7 @@
+@@ -16,6 +16,7 @@
-Wextra
-Werror
-Wconversion
@@ -9,7 +10,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-Wno-unused-parameter
-Wold-style-cast
-Woverloaded-virtual
-@@ -24,16 +25,15 @@
+@@ -25,16 +26,15 @@
-march=native
# -MMD
# -std=c++0x
@@ -28,12 +29,3 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-@@ -55,6 +55,8 @@
- endif()
-
- include_directories(${Boost_INCLUDE_DIRS})
-+include_directories(/usr/lib/gcc/x86_64-linux-gnu/4.4/include/)
-+include_directories(/usr/lib/gcc/x86_64-linux-gnu/4.4/include-fixed/)
-
- include_directories(${PROJECT_SOURCE_DIR})
-
View
2  examples/multiplexer/demux.cc
@@ -17,7 +17,7 @@ using namespace muduo::net;
typedef boost::shared_ptr<TcpClient> TcpClientPtr;
-const int kMaxConns = 1;
+// const int kMaxConns = 1;
const size_t kMaxPacketLen = 255;
const size_t kHeaderLen = 3;
View
2  examples/sudoku/sudoku.cc
@@ -20,7 +20,7 @@ struct Node
};
const int kMaxNodes = 1 + 81*4 + 9*9*9*4;
-const int kMaxColumns = 400;
+// const int kMaxColumns = 400;
const int kRow = 100, kCol = 200, kBox = 300;
class SudokuSolver
View
1  muduo/base/tests/BlockingQueue_test.cc
@@ -6,6 +6,7 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <string>
#include <stdio.h>
+#include <unistd.h>
class Test
{
View
1  muduo/base/tests/SingletonThreadLocal_test.cc
@@ -6,6 +6,7 @@
#include <boost/bind.hpp>
#include <boost/noncopyable.hpp>
#include <stdio.h>
+#include <unistd.h>
class Test : boost::noncopyable
{
View
1  muduo/base/tests/Thread_test.cc
@@ -4,6 +4,7 @@
#include <string>
#include <boost/bind.hpp>
#include <stdio.h>
+#include <unistd.h>
void mysleep(int seconds)
{
View
8 muduo/net/protobuf/ProtobufCodecLite.h
@@ -88,10 +88,10 @@ class ProtobufCodecLite : boost::noncopyable
ErrorCode)> ErrorCallback;
ProtobufCodecLite(const ::google::protobuf::Message* prototype,
- StringPiece tag,
- const ProtobufMessageCallback& messageCb,
- const RawMessageCallback& rawCb = RawMessageCallback(),
- const ErrorCallback& errorCb = defaultErrorCallback)
+ StringPiece tag,
+ const ProtobufMessageCallback& messageCb,
+ const RawMessageCallback& rawCb = RawMessageCallback(),
+ const ErrorCallback& errorCb = defaultErrorCallback)
: prototype_(prototype),
tag_(tag.as_string()),
messageCallback_(messageCb),
Please sign in to comment.
Something went wrong with that request. Please try again.