Commit 427fd6d7 authored by Dominik Charousset's avatar Dominik Charousset

Use correct define to disable memory management

parent 597b8c26
...@@ -86,7 +86,7 @@ class instance_wrapper; ...@@ -86,7 +86,7 @@ class instance_wrapper;
template <class T> template <class T>
class basic_memory_cache; class basic_memory_cache;
#ifdef CAF_DISABLE_MEM_MANAGEMENT #ifdef CAF_NO_MEM_MANAGEMENT
class memory { class memory {
...@@ -106,7 +106,7 @@ class memory { ...@@ -106,7 +106,7 @@ class memory {
}; };
#else // CAF_DISABLE_MEM_MANAGEMENT #else // CAF_NO_MEM_MANAGEMENT
template <class T> template <class T>
class basic_memory_cache : public memory_cache { class basic_memory_cache : public memory_cache {
...@@ -224,7 +224,7 @@ class memory { ...@@ -224,7 +224,7 @@ class memory {
}; };
#endif // CAF_DISABLE_MEM_MANAGEMENT #endif // CAF_NO_MEM_MANAGEMENT
} // namespace detail } // namespace detail
} // namespace caf } // namespace caf
......
...@@ -17,19 +17,24 @@ ...@@ -17,19 +17,24 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#include "caf/detail/memory.hpp"
#include <vector> #include <vector>
#include <typeinfo> #include <typeinfo>
#include "caf/detail/memory.hpp"
#include "caf/mailbox_element.hpp" #include "caf/mailbox_element.hpp"
using namespace std; 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 caf {
namespace detail { namespace detail {
...@@ -90,4 +95,4 @@ instance_wrapper::~instance_wrapper() { ...@@ -90,4 +95,4 @@ instance_wrapper::~instance_wrapper() {
} // namespace detail } // namespace detail
} // namespace caf } // namespace caf
#endif // CAF_DISABLE_MEM_MANAGEMENT #endif // CAF_NO_MEM_MANAGEMENT
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment