TypedAllocationManager (frontend) now in lib:: -- unit test pass
This commit is contained in:
parent
d7ef67e821
commit
abd23ae399
7 changed files with 20 additions and 41 deletions
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
|
||||
|
||||
namespace control { ////////////////////////////////////////////////////////////TODO: should go into namespace lib
|
||||
namespace lib {
|
||||
|
||||
using std::tr1::shared_ptr;
|
||||
|
||||
|
|
@ -318,5 +318,5 @@ namespace control { ////////////////////////////////////////////////////////////
|
|||
return allocCnt_.get<XX>();
|
||||
}
|
||||
|
||||
} // namespace control
|
||||
} // namespace lib
|
||||
#endif
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#ifndef CONTROL_COMMAND_ARGUMENT_HOLDER_H
|
||||
#define CONTROL_COMMAND_ARGUMENT_HOLDER_H
|
||||
|
||||
#include "proc/control/typed-allocation-manager.hpp"
|
||||
#include "lib/typed-allocation-manager.hpp"
|
||||
#include "proc/control/argument-tuple-accept.hpp"
|
||||
#include "proc/control/command-closure.hpp"
|
||||
#include "proc/control/memento-tie.hpp"
|
||||
|
|
@ -54,6 +54,7 @@
|
|||
|
||||
namespace control {
|
||||
|
||||
using lib::TypedAllocationManager;
|
||||
using lib::InPlaceBuffer;
|
||||
using std::string;
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
#include "lib/format.hpp"
|
||||
#include "lib/util.hpp"
|
||||
#include "proc/control/argument-erasure.hpp"
|
||||
#include "proc/control/typed-allocation-manager.hpp"
|
||||
#include "lib/typed-allocation-manager.hpp"
|
||||
|
||||
#include <tr1/memory>
|
||||
#include <tr1/functional>
|
||||
|
|
@ -98,6 +98,7 @@ namespace control {
|
|||
using lumiera::typelist::StoreFunction;
|
||||
using lumiera::typelist::NullType;
|
||||
|
||||
using lib::TypedAllocationManager;
|
||||
using util::unConst;
|
||||
using std::tr1::function;
|
||||
using std::ostream;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
#include "proc/control/command.hpp"
|
||||
#include "proc/control/command-closure.hpp"
|
||||
#include "proc/control/command-mutation.hpp"
|
||||
#include "proc/control/typed-allocation-manager.hpp"
|
||||
#include "lib/typed-allocation-manager.hpp"
|
||||
#include "lib/bool-checkable.hpp"
|
||||
|
||||
#include <boost/noncopyable.hpp>
|
||||
|
|
@ -57,6 +57,7 @@
|
|||
|
||||
namespace control {
|
||||
|
||||
using lib::TypedAllocationManager;
|
||||
using std::tr1::function;
|
||||
using std::tr1::shared_ptr;
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
#include "proc/control/command.hpp"
|
||||
#include "proc/control/command-signature.hpp"
|
||||
#include "proc/control/command-argument-holder.hpp"
|
||||
#include "proc/control/typed-allocation-manager.hpp"
|
||||
#include "lib/typed-allocation-manager.hpp"
|
||||
|
||||
#include <boost/functional/hash.hpp>
|
||||
#include <boost/noncopyable.hpp>
|
||||
|
|
@ -85,6 +85,7 @@ namespace control {
|
|||
using boost::noncopyable;
|
||||
using std::tr1::shared_ptr;
|
||||
using std::tr1::unordered_map;
|
||||
using lib::TypedAllocationManager;
|
||||
using util::getValue_or_default;
|
||||
using util::contains;
|
||||
using std::string;
|
||||
|
|
|
|||
|
|
@ -853,7 +853,7 @@ return: 0
|
|||
END
|
||||
|
||||
|
||||
TEST "TypedAllocationManager_test" TypedAllocationManager_test <<END
|
||||
TEST "TypedAllocationManager" TypedAllocationManager_test <<END
|
||||
return: 0
|
||||
END
|
||||
|
||||
|
|
|
|||
|
|
@ -22,48 +22,23 @@
|
|||
|
||||
|
||||
#include "lib/test/run.hpp"
|
||||
#include "lib/test/test-helper.hpp"
|
||||
//#include "proc/control/command.hpp"
|
||||
#include "proc/control/typed-allocation-manager.hpp"
|
||||
//#include "proc/control/command-def.hpp"
|
||||
//#include "lib/lumitime.hpp"
|
||||
//#include "lib/symbol.hpp"
|
||||
#include "lib/typed-allocation-manager.hpp"
|
||||
#include "lib/util.hpp"
|
||||
|
||||
|
||||
#include <tr1/memory>
|
||||
//#include <boost/ref.hpp>
|
||||
//#include <boost/format.hpp>
|
||||
//#include <iostream>
|
||||
#include <cstdlib>
|
||||
//#include <string>
|
||||
|
||||
|
||||
namespace control {
|
||||
namespace test {
|
||||
|
||||
|
||||
// using boost::format;
|
||||
// using boost::str;
|
||||
//using lumiera::Time;
|
||||
//using util::contains;
|
||||
using std::tr1::shared_ptr;
|
||||
// using std::tr1::bind;
|
||||
// using std::string;
|
||||
using std::rand;
|
||||
//using std::cout;
|
||||
//using std::endl;
|
||||
// using lib::test::showSizeof;
|
||||
namespace lib {
|
||||
namespace test{
|
||||
|
||||
|
||||
using util::isSameObject;
|
||||
// using util::contains;
|
||||
|
||||
// using session::test::TestClip;
|
||||
// using lib::Symbol;
|
||||
// using lumiera::P;
|
||||
using std::tr1::shared_ptr;
|
||||
using std::rand;
|
||||
|
||||
|
||||
//using lumiera::typelist::BuildTupleAccessor;
|
||||
// using lumiera::error::LUMIERA_ERROR_EXTERNAL;
|
||||
|
||||
namespace { // test data and helpers...
|
||||
|
||||
|
|
@ -99,7 +74,7 @@ namespace test {
|
|||
* @test cover the basic implementation of a custom allocator, delegating to mpool.
|
||||
* TypedAllocationManager is a base class, used e.g. to build the CommandRegistry.
|
||||
*
|
||||
* @todo planned but not implemented as of 8/09 see also Ticket #217
|
||||
* @todo as of 9/09 we do heap allocation, but we should use mpool -- see also Ticket #219
|
||||
*
|
||||
* @see CommandRegistry
|
||||
* @see command-registry-test.cpp
|
||||
|
|
@ -162,4 +137,4 @@ namespace test {
|
|||
LAUNCHER (TypedAllocationManager_test, "unit common");
|
||||
|
||||
|
||||
}} // namespace control::test
|
||||
}} // namespace lib::test
|
||||
|
|
|
|||
Loading…
Reference in a new issue