Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
049c2f12
Unverified
Commit
049c2f12
authored
Nov 09, 2017
by
Dominik Charousset
Committed by
GitHub
Nov 09, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #620
Enable compilation on MSVC v140_clang_c2 platform
parents
24368f18
e0d11d11
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
9 deletions
+17
-9
cmake/MSVC_v140_clang_c2.cmake
cmake/MSVC_v140_clang_c2.cmake
+5
-0
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+2
-4
libcaf_core/caf/config.hpp
libcaf_core/caf/config.hpp
+6
-0
libcaf_core/caf/data_processor.hpp
libcaf_core/caf/data_processor.hpp
+1
-0
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+2
-4
libcaf_io/caf/io/middleman.hpp
libcaf_io/caf/io/middleman.hpp
+1
-1
No files found.
cmake/MSVC_v140_clang_c2.cmake
0 → 100644
View file @
049c2f12
## FLAGS FOR MSVC v140_clang_c2
set
(
CMAKE_CXX_FLAGS_DEBUG_INIT
"/D_DEBUG /MTd /GR -Od -g2 -gdwarf-2 -std=c++1z -fms-extensions -fexceptions"
)
set
(
CMAKE_CXX_FLAGS_MINSIZEREL_INIT
"/MT /GR -O1 /D NDEBUG -std=c++1z -fms-extensions -fexceptions"
)
set
(
CMAKE_CXX_FLAGS_RELEASE_INIT
"/MT /GR -O3 /D NDEBUG -std=c++1z -fms-extensions -fexceptions"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT
"/MT /GR -O2 /D NDEBUG -gline-tables-only -std=c++1z -fms-extensions -fexceptions"
)
libcaf_core/CMakeLists.txt
View file @
049c2f12
...
...
@@ -129,7 +129,7 @@ if (NOT CAF_BUILD_STATIC_ONLY)
OUTPUT_NAME caf_core
)
if
(
CYGWIN
)
install
(
TARGETS libcaf_core_shared RUNTIME DESTINATION bin
)
else
if
(
NOT WIN32
)
else
(
)
install
(
TARGETS libcaf_core_shared LIBRARY DESTINATION lib
)
endif
()
add_dependencies
(
libcaf_core_shared libcaf_core
)
...
...
@@ -140,9 +140,7 @@ if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_library
(
libcaf_core_static STATIC
${
LIBCAF_CORE_HDRS
}
${
LIBCAF_CORE_SRCS
}
)
target_link_libraries
(
libcaf_core_static
${
LD_FLAGS
}
)
set_target_properties
(
libcaf_core_static PROPERTIES OUTPUT_NAME caf_core_static
)
if
(
NOT WIN32
)
install
(
TARGETS libcaf_core_static ARCHIVE DESTINATION lib
)
endif
()
install
(
TARGETS libcaf_core_static ARCHIVE DESTINATION lib
)
add_dependencies
(
libcaf_core_static libcaf_core
)
endif
()
...
...
libcaf_core/caf/config.hpp
View file @
049c2f12
...
...
@@ -188,6 +188,12 @@
# define CAF_POSIX
#endif
#if defined(CAF_WINDOWS)
# if defined(__clang__)
struct
IUnknown
;
// fix for issue with static_cast<> in objbase.h (see https://github.com/philsquared/Catch/issues/690)
# endif
#endif
#include <cstdio>
#include <cstdlib>
...
...
libcaf_core/caf/data_processor.hpp
View file @
049c2f12
...
...
@@ -25,6 +25,7 @@
#include <cstdint>
#include <cstddef> // size_t
#include <type_traits>
#include <iterator>
#include "caf/fwd.hpp"
#include "caf/atom.hpp"
...
...
libcaf_io/CMakeLists.txt
View file @
049c2f12
...
...
@@ -43,7 +43,7 @@ if (NOT CAF_BUILD_STATIC_ONLY)
OUTPUT_NAME caf_io
)
if
(
CYGWIN
)
install
(
TARGETS libcaf_io_shared RUNTIME DESTINATION bin
)
else
if
(
NOT WIN32
)
else
(
)
install
(
TARGETS libcaf_io_shared LIBRARY DESTINATION lib
)
endif
()
add_dependencies
(
libcaf_io_shared libcaf_io
)
...
...
@@ -54,9 +54,7 @@ if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_library
(
libcaf_io_static STATIC
${
LIBCAF_IO_HDRS
}
${
LIBCAF_IO_SRCS
}
)
target_link_libraries
(
libcaf_io_static
${
LD_FLAGS
}
${
CAF_LIBRARY_CORE_STATIC
}
)
set_target_properties
(
libcaf_io_static PROPERTIES OUTPUT_NAME caf_io_static
)
if
(
NOT WIN32
)
install
(
TARGETS libcaf_io_static ARCHIVE DESTINATION lib
)
endif
()
install
(
TARGETS libcaf_io_static ARCHIVE DESTINATION lib
)
add_dependencies
(
libcaf_io_static libcaf_io
)
endif
()
...
...
libcaf_io/caf/io/middleman.hpp
View file @
049c2f12
...
...
@@ -43,7 +43,7 @@ namespace io {
/// Manages brokers and network backends.
class
middleman
:
public
actor_system
::
module
{
public:
friend
class
actor_system
;
friend
class
::
caf
::
actor_system
;
using
hook_vector
=
std
::
vector
<
hook_uptr
>
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment