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
427fd6d7
Commit
427fd6d7
authored
Sep 17, 2014
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use correct define to disable memory management
parent
597b8c26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
8 deletions
+13
-8
libcaf_core/caf/detail/memory.hpp
libcaf_core/caf/detail/memory.hpp
+3
-3
libcaf_core/src/memory.cpp
libcaf_core/src/memory.cpp
+10
-5
No files found.
libcaf_core/caf/detail/memory.hpp
View file @
427fd6d7
...
...
@@ -86,7 +86,7 @@ class instance_wrapper;
template
<
class
T
>
class
basic_memory_cache
;
#ifdef CAF_
DISABLE
_MEM_MANAGEMENT
#ifdef CAF_
NO
_MEM_MANAGEMENT
class
memory
{
...
...
@@ -106,7 +106,7 @@ class memory {
};
#else // CAF_
DISABLE
_MEM_MANAGEMENT
#else // CAF_
NO
_MEM_MANAGEMENT
template
<
class
T
>
class
basic_memory_cache
:
public
memory_cache
{
...
...
@@ -224,7 +224,7 @@ class memory {
};
#endif // CAF_
DISABLE
_MEM_MANAGEMENT
#endif // CAF_
NO
_MEM_MANAGEMENT
}
// namespace detail
}
// namespace caf
...
...
libcaf_core/src/memory.cpp
View file @
427fd6d7
...
...
@@ -17,19 +17,24 @@
* http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/
#include "caf/detail/memory.hpp"
#include <vector>
#include <typeinfo>
#include "caf/detail/memory.hpp"
#include "caf/mailbox_element.hpp"
using
namespace
std
;
#ifdef CAF_
DISABLE
_MEM_MANAGEMENT
#ifdef CAF_
NO
_MEM_MANAGEMENT
int
caf_memory_keep_compiler_happy
()
{
return
0
;
}
int
caf_memory_keep_compiler_happy
()
{
// this function shuts up a linker warning saying that the
// object file has no symbols
return
0
;
}
#else // CAF_
DISABLE
_MEM_MANAGEMENT
#else // CAF_
NO
_MEM_MANAGEMENT
namespace
caf
{
namespace
detail
{
...
...
@@ -90,4 +95,4 @@ instance_wrapper::~instance_wrapper() {
}
// namespace detail
}
// namespace caf
#endif // CAF_
DISABLE
_MEM_MANAGEMENT
#endif // CAF_
NO
_MEM_MANAGEMENT
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