Fixed compilations errors.

Added some more debugging code.
This commit is contained in:
Gunnar Beutner 2012-04-03 19:10:51 +02:00
parent cac3c2109a
commit 6fea4d6baa
4 changed files with 36 additions and 21 deletions

View File

@ -15,6 +15,7 @@ libbase_la_SOURCES = \
confighive.h \
configobject.cpp \
configobject.h \
cxx11-compat.h \
delegate.h \
event.h \
exception.cpp \

View File

@ -17,6 +17,9 @@ Application::Application(void)
lt_dlinit();
#endif /* _WIN32 */
char *debugging = getenv("_DEBUG");
m_Debugging = (debugging && strtol(debugging, NULL, 10) != 0);
m_ShuttingDown = false;
m_ConfigHive = make_shared<ConfigHive>();
}
@ -30,6 +33,8 @@ Application::~Application(void)
i->second->Stop();
}
m_Components.clear();
#ifdef _WIN32
WSACleanup();
#else /* _WIN32 */
@ -349,3 +354,8 @@ void Application::AddComponentSearchDir(const string& componentDirectory)
lt_dladdsearchdir(componentDirectory.c_str());
#endif /* _WIN32 */
}
bool Application::IsDebugging(void) const
{
return m_Debugging;
}

View File

@ -13,6 +13,7 @@ private:
ConfigHive::Ptr m_ConfigHive;
map< string, shared_ptr<Component> > m_Components;
vector<string> m_Arguments;
bool m_Debugging;
public:
typedef shared_ptr<Application> Ptr;
@ -42,6 +43,8 @@ public:
void AddComponentSearchDir(const string& componentDirectory);
const string& GetExeDirectory(void);
bool IsDebugging(void) const;
};
template<class T>
@ -58,11 +61,11 @@ int application_main(int argc, char **argv)
Application::Instance->SetArguments(args);
#ifndef _DEBUG
try {
#endif /* !_DEBUG */
if (Application::Instance->IsDebugging()) {
result = Application::Instance->Main(args);
} else {
try {
result = Application::Instance->Main(args);
#ifndef _DEBUG
} catch (const Exception& ex) {
cout << "---" << endl;
@ -83,7 +86,7 @@ int application_main(int argc, char **argv)
return EXIT_FAILURE;
}
#endif /* !_DEBUG */
}
Application::Instance.reset();

View File

@ -71,7 +71,8 @@ void ConnectionManager::RegisterMethod(string method, function<int (NewMessageEv
void ConnectionManager::UnregisterMethod(string method, function<int (NewMessageEventArgs::Ptr)> callback)
{
m_Methods[method] -= callback;
// TODO: implement
//m_Methods[method] -= callback;
}
void ConnectionManager::SendMessage(JsonRpcMessage::Ptr message)