summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Donchev <aleksander.donchev@partner.bmw.de>2013-07-12 14:48:46 +0200
committerAleksander Donchev <aleksander.donchev@partner.bmw.de>2013-07-12 14:48:46 +0200
commit8b4b98641c0d0d869fbe05899c3a309044e26c34 (patch)
treeedd64732c18173fbf55233fdeab65153403944fb
parente79efe3d4335de208da7b62a64ddeb303f613067 (diff)
downloadaudiomanager-8b4b98641c0d0d869fbe05899c3a309044e26c34.tar.gz
Fixed define in the map handler header causing compile error for some tests. (ticket #79)
Renamed variable in the CAmTelnetServerTest.cpp Signed-off-by: Christian Linke <christian.linke@bmw.de>
-rw-r--r--AudioManagerDaemon/include/CAmDatabaseHandlerMap.h8
-rw-r--r--AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp2
-rw-r--r--AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h5
3 files changed, 7 insertions, 8 deletions
diff --git a/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h b/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
index 87f46b5..418cc1b 100644
--- a/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
+++ b/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
@@ -34,12 +34,10 @@
namespace am
{
#ifndef AM_MAP_CAPACITY
- #ifdef WITH_DATABASE_STORAGE
- #define AM_MAP_CAPACITY @AM_MAP_CAPACITY@
- #else
- #define AM_MAP_CAPACITY 0
- #endif
+ #define AM_MAP_CAPACITY 0
#endif
+
+
#define AM_MAP std::unordered_map
//todo: check the enum values before entering & changing in the database.
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
index bc09eac..429ceda 100644
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
@@ -55,7 +55,7 @@ CAmEnvironment::CAmEnvironment()
, mlistCommandPluginDirs()
, mSocketHandler()
#ifdef WITH_DATABASE_STORAGE
-, mpDatabasehandler(std::string(":memory:"))
+, mDatabasehandler(std::string(":memory:"))
#else
, mDatabasehandler()
#endif
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
index db2200f..257d1e6 100644
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
@@ -28,11 +28,12 @@
#include "CAmCommandSender.h"
#include "CAmControlSender.h"
#include "CAmRouter.h"
-#include "IAmDatabaseHandler.h"
+#include "config.h"
+
#ifdef WITH_DATABASE_STORAGE
#include "CAmDatabaseHandlerSQLite.h"
#else
- #include "CAmDatabaseHandlerMap.h"
+ #include "CAmDatabaseHandlerMap.h"
#endif
namespace am