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
be73e593
Commit
be73e593
authored
Oct 31, 2011
by
neverlord
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed makefile ordering issue and boost-thread include
parent
9315bd3d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
38 deletions
+7
-38
blob/Makefile.am
blob/Makefile.am
+2
-3
blob/configure.ac
blob/configure.ac
+0
-31
src/actor_proxy_cache.cpp
src/actor_proxy_cache.cpp
+1
-1
src/local_actor.cpp
src/local_actor.cpp
+1
-1
unit_testing/main.cpp
unit_testing/main.cpp
+2
-2
unit_testing/test__remote_actor.cpp
unit_testing/test__remote_actor.cpp
+1
-0
No files found.
blob/Makefile.am
View file @
be73e593
...
...
@@ -69,7 +69,6 @@ cppatest_SOURCES = \
../unit_testing/test__intrusive_ptr.cpp
\
../unit_testing/test__local_group.cpp
\
../unit_testing/test__primitive_variant.cpp
\
../unit_testing/test__queue_performance.cpp
\
../unit_testing/test__remote_actor.cpp
\
../unit_testing/test__ripemd_160.cpp
\
../unit_testing/test__serialization.cpp
\
...
...
@@ -80,5 +79,5 @@ cppatest_SOURCES = \
AM_CPPFLAGS
=
-I
../
cppatest_CXXFLAGS
=
--std
=
c++0x
-pedantic
-Wall
-Wextra
AM_LDFLAGS
=
$(BOOST_LDFLAGS)
$(BOOST_THREAD_LIB)
#
AM_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
cppatest_LDADD
=
$(BOOST_LDFLAGS)
$(BOOST_THREAD_LIB)
blob/configure.ac
View file @
be73e593
...
...
@@ -9,36 +9,5 @@ AC_PROG_CXX
AX_BOOST_BASE([1.42.0])
AX_BOOST_THREAD
# check for C++0x compatibility
AC_LANG([C++])
ORIGINAL_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -Werror --std=c++0x"
AC_CACHE_CHECK(
[whether C++ compiler supports variadic templates],
[ac_cv_cpp_variadic_templates],
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include "../variadic_templates_test.cpp"]])],
[ac_cv_cpp_variadic_templates=yes],
[ac_cv_cpp_variadic_templates=no]))
AC_CACHE_CHECK(
[whether C++ compiler supports nullptr],
[ac_cv_cpp_nullptr],
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[static void* myptr = nullptr;]])],
[ac_cv_cpp_nullptr=yes],
[ac_cv_cpp_nullptr=no]))
AS_IF(
[test "x$ac_cv_cpp_variadic_templates" = "xyes" &&
test "x$ac_cv_cpp_nullptr" = "xyes"],
[],
[AC_MSG_ERROR([at least one required C++ compiler feature is not supported])])
CPPFLAGS="$ORIGINAL_CPPFLAGS"
# environment
AC_ARG_VAR([NO_VERSIONED_INCLUDE_DIR], [set this to 1 in order to install headers into <prefix>/cppa/ rather than into <prefix>/cppa/<version>/cppa/])
AM_CONDITIONAL([VERSIONED_INCLUDE_DIR], [test "x$NO_VERSIONED_INCLUDE_DIR" != "x1"])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
src/actor_proxy_cache.cpp
View file @
be73e593
...
...
@@ -4,7 +4,7 @@
#include "cppa/detail/actor_proxy_cache.hpp"
// thread_specific_ptr
#include <boost/thread.hpp>
#include <boost/thread
/tss
.hpp>
namespace
{
...
...
src/local_actor.cpp
View file @
be73e593
// for thread_specific_ptr
// needed unless the new keyword "thread_local" works in GCC
#include <boost/thread.hpp>
#include <boost/thread
/tss
.hpp>
#include "cppa/local_actor.hpp"
#include "cppa/any_tuple.hpp"
...
...
unit_testing/main.cpp
View file @
be73e593
...
...
@@ -144,13 +144,13 @@ int main(int argc, char** argv)
if
(
found_key
(
i
,
args
,
"run"
))
{
auto
&
what
=
i
->
second
;
if
(
what
==
"performance_test"
)
/*
if (what == "performance_test")
{
cout << endl << "run queue performance test ... " << endl;
test__queue_performance();
return 0;
}
else
if
(
what
==
"remote_actor"
)
else
*/
if
(
what
==
"remote_actor"
)
{
test__remote_actor
(
argv
[
0
],
true
,
args
);
return
0
;
...
...
unit_testing/test__remote_actor.cpp
View file @
be73e593
...
...
@@ -42,6 +42,7 @@ void client_part(const std::map<std::string, std::string>& args)
size_t
test__remote_actor
(
const
char
*
app_path
,
bool
is_client
,
const
std
::
map
<
std
::
string
,
std
::
string
>&
args
)
{
return
0
;
if
(
is_client
)
{
client_part
(
args
);
...
...
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