From 255e501258fca1d85ca5fce73f549367e0fe0812 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Mon, 8 Dec 2008 11:03:42 +0100 Subject: [PATCH] comments and #ifdef __cplusplus --- src/include/guinotificationfacade.h | 9 ++++++++- src/lumiera/appstate.cpp | 2 +- src/lumiera/subsys.hpp | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/include/guinotificationfacade.h b/src/include/guinotificationfacade.h index 5d3ec28fc..2898db538 100644 --- a/src/include/guinotificationfacade.h +++ b/src/include/guinotificationfacade.h @@ -38,6 +38,8 @@ #define GUI_GUINOTIFICATION_H +#ifdef __cplusplus /* ============== C++ Interface ================= */ + #include "common/singletonsubclass.hpp" #include @@ -79,7 +81,11 @@ namespace gui { } // namespace gui + extern "C" { +#endif /* =========================== CLI Interface ================= */ + + #include "lumiera/interface.h" LUMIERA_INTERFACE_DECLARE (lumieraorg_GuiNotification, 1, @@ -88,6 +94,7 @@ LUMIERA_INTERFACE_DECLARE (lumieraorg_GuiNotification, 1, ); +#ifdef __cplusplus } - +#endif #endif diff --git a/src/lumiera/appstate.cpp b/src/lumiera/appstate.cpp index a654f223e..916e0755c 100644 --- a/src/lumiera/appstate.cpp +++ b/src/lumiera/appstate.cpp @@ -189,7 +189,7 @@ namespace lumiera { AppState::abort (lumiera::Error& problem) { - INFO (operate, "Address of Config Facade = %x", &lumiera::Config::instance()); //////////TODO: a temp hack to force configfacade.cpp to be linked into lumiera.exe + INFO (operate, "Address of Config Facade = %x", &lumiera::Config::instance()); //////////TODO: a temp hack to force configfacade.cpp to be linked into lumiera exe. ERROR (operate, "Aborting Lumiera after unhandled error: %s", cStr(problem.what())); diff --git a/src/lumiera/subsys.hpp b/src/lumiera/subsys.hpp index ccb3bfbcd..61f08d84b 100644 --- a/src/lumiera/subsys.hpp +++ b/src/lumiera/subsys.hpp @@ -23,7 +23,7 @@ /** @file subsys.hpp ** Describing dependencies and lifecycle of the application's primary parts. ** Within Lumiera's main(), a small number of well-known application subsystems - ** need to be started and maintained, while observing some interrelations. + ** need to be started and maintained, observing some interrelations. ** While the activation of the key components is controlled by options, maybe ** some prerequisite subsystems need to be pulled up, and in case of an regular ** or irregular exit of a given subsystem, the whole dependency graph needs @@ -56,7 +56,6 @@ namespace lumiera { using std::string; -// using boost::scoped_ptr; using boost::noncopyable; using std::tr1::function;