coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-08 18:56:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 88f7bffc4f3359c4772559c20844b01ab25399c7 into 95b69b7572df59495edede7542d1bf5d28d3578d

Browse Source
This commit is contained in:
徐辰 2013-02-26 22:01:54 -08:00
commit 845ace9856
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -116,7 +116,9 @@ else()
endif() endif()
if (CMAKE_HOST_UNIX) if (CMAKE_HOST_UNIX)
list(APPEND LIBS "dl") if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
list(APPEND LIBS "dl")
endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
if (MULTITHREAD_SUPPORT_ENABLED) if (MULTITHREAD_SUPPORT_ENABLED)
list(APPEND LIBS "pthread") list(APPEND LIBS "pthread")

2
include/chaiscript/dispatchkit/type_info.hpp
View File

@ -28,7 +28,7 @@ namespace chaiscript
class Type_Info class Type_Info
{ {
public: public:
Type_Info(bool t_is_const, bool t_is_reference, bool t_is_pointer, bool t_is_void, constexpr Type_Info(bool t_is_const, bool t_is_reference, bool t_is_pointer, bool t_is_void,
bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bareti) bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bareti)
: m_type_info(t_ti), m_bare_type_info(t_bareti), : m_type_info(t_ti), m_bare_type_info(t_bareti),
m_is_const(t_is_const), m_is_reference(t_is_reference), m_is_pointer(t_is_pointer), m_is_const(t_is_const), m_is_reference(t_is_reference), m_is_pointer(t_is_pointer),