Changeset 230 in pacpusframework

Timestamp:

Nov 27, 2013, 1:24:57 PM (11 years ago)

Author:

Marek Kurdej

Message:

Fixed: Qt4 compilation on Linux

Location:

branches/0.1.x/src/PacpusLib

Files:

• ComponentManager.cpp (modified) (1 diff)
• Log.cpp (modified) (3 diffs)
• XmlConfigFile.cpp (modified) (1 diff)

branches/0.1.x/src/PacpusLib/ComponentManager.cpp

@@ -11 +11 @@
 #include <Pacpus/kernel/ConnectionBase.h>
 #include <Pacpus/kernel/Log.h>
+
+#include <cassert>
 #include <QObject>
 #include <QDomNodeList>

branches/0.1.x/src/PacpusLib/Log.cpp

@@ -34 +34 @@
 PACPUSLIB_API std::basic_ostream<char>& operator<< (std::basic_ostream<char>& strm, QString const& s);
 
-namespace pacpus {
+namespace pacpus
+{
    
 void init_log_factories()
@@ -141 +142 @@
 
 namespace pacpus
+{
 
     LogConfigurator::LogConfigurator()
     {}
-    void LogConfigurator::configureLoggerWithFile(const char * /*configFilename*/)
+
+    LogConfigurator::~LogConfigurator()
+    {}
+
+    void LogConfigurator::configureLoggerWithFile(const char* /*configFilename*/)
     {}
 
@@ -150 +156 @@
 
 #endif // PACPUS_USE_LOG
+

branches/0.1.x/src/PacpusLib/XmlConfigFile.cpp

@@ -9 +9 @@
 #include <Pacpus/kernel/Log.h>
 
+#include <cassert>
 #include <QFile>
 #include <QTextStream>