Mirror/Crow
1
0
Fork 0
mirror of https://github.com/CrowCpp/Crow.git synced 2024-06-07 21:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #171 from yorickdewid/master

Browse Source 
Set cast type without dereferencing pointer
This commit is contained in:
Jaeseung Ha 2017-09-18 00:44:36 +09:00 committed by GitHub
commit 6da6579ce9
6 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -7,9 +7,11 @@ conan_basic_setup()
endif() endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
find_package(Tcmalloc) find_package(Tcmalloc)
find_package(Threads) find_package(Threads)
find_package(OpenSSL) find_package(OpenSSL)
if(OPENSSL_FOUND) if(OPENSSL_FOUND)
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
endif() endif()
@ -28,7 +30,6 @@ if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release") set(CMAKE_BUILD_TYPE "Release")
endif() endif()
if (MSVC) if (MSVC)
set(Boost_USE_STATIC_LIBS "On") set(Boost_USE_STATIC_LIBS "On")
find_package( Boost 1.52 COMPONENTS system thread regex REQUIRED ) find_package( Boost 1.52 COMPONENTS system thread regex REQUIRED )
@ -48,6 +49,7 @@ include_directories("${PROJECT_SOURCE_DIR}")
#add_subdirectory(src) #add_subdirectory(src)
add_subdirectory(examples) add_subdirectory(examples)
if (MSVC) if (MSVC)
else() else()
add_subdirectory(tests) add_subdirectory(tests)

2
examples/CMakeLists.txt
View File

@ -6,7 +6,6 @@ add_executable(example_vs example_vs.cpp)
target_link_libraries(example_vs ${Boost_LIBRARIES}) target_link_libraries(example_vs ${Boost_LIBRARIES})
target_link_libraries(example_vs ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(example_vs ${CMAKE_THREAD_LIBS_INIT})
else () else ()
add_executable(helloworld helloworld.cpp) add_executable(helloworld helloworld.cpp)
target_link_libraries(helloworld ${Boost_LIBRARIES}) target_link_libraries(helloworld ${Boost_LIBRARIES})
target_link_libraries(helloworld ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(helloworld ${CMAKE_THREAD_LIBS_INIT})
@ -49,7 +48,6 @@ add_custom_command(OUTPUT example_test.py
add_custom_target(example_copy ALL DEPENDS example_test.py) add_custom_target(example_copy ALL DEPENDS example_test.py)
add_executable(example_chat example_chat.cpp) add_executable(example_chat example_chat.cpp)
#target_link_libraries(example_chat crow)
target_link_libraries(example_chat ${Boost_LIBRARIES}) target_link_libraries(example_chat ${Boost_LIBRARIES})
target_link_libraries(example_chat ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(example_chat ${CMAKE_THREAD_LIBS_INIT})
add_custom_command(OUTPUT example_chat.html add_custom_command(OUTPUT example_chat.html

6
include/crow/http_response.h
View File

@ -86,6 +86,12 @@ namespace crow
completed_ = false; completed_ = false;
} }
void redirect(const std::string& location)
{
code = 301;
set_header("Location", location);
}
void write(const std::string& body_part) void write(const std::string& body_part)
{ {
body += body_part; body += body_part;

2
include/crow/http_server.h
View File

@ -148,7 +148,7 @@ namespace crow
}); });
} }
CROW_LOG_INFO << server_name_ << " server is running on port " << port_ CROW_LOG_INFO << server_name_ << " server is running at " << bindaddr_ <<":" << port_
<< " using " << concurrency_ << " threads"; << " using " << concurrency_ << " threads";
signals_.async_wait( signals_.async_wait(