Move EXPORT_COMPONENT() macros to the beginning of the files.

Fixes #3654

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index af6e83a4bac9c1d48c94968e14a44c94c1e5ba5b..5f6694e95154e81670dfc3271ab43af4a25462d3 100644 (file)
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -21,6 +21,8 @@
 
 using namespace icinga;
 
+EXPORT_COMPONENT(checker, CheckerComponent);
+
 void CheckerComponent::Start(void)
 {
        m_Endpoint = Endpoint::MakeEndpoint("checker", false);
@@ -193,6 +195,3 @@ void CheckerComponent::ObjectRemovedHandler(const DynamicObject::Ptr& object)
        m_IdleServices.erase(service);
        m_PendingServices.erase(service);
 }
-
-EXPORT_COMPONENT(checker, CheckerComponent);
-

diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp
index db0b15b046eaca12b4f146bd711db21c7107823e..2fae796f09f92dd0c82f6ac80f8cee89f58f5afd 100644 (file)
--- a/components/compat/compatcomponent.cpp
+++ b/components/compat/compatcomponent.cpp
@@ -21,6 +21,8 @@
 
 using namespace icinga;
 
+EXPORT_COMPONENT(compat, CompatComponent);
+
 /**
  * Hint: The reason why we're using "\n" rather than std::endl is because
  * std::endl also _flushes_ the output stream which severely degrades
@@ -546,5 +548,3 @@ void CompatComponent::StatusTimerHandler(void)
        if (rename(objectspathtmp.CStr(), objectspath.CStr()) < 0)
                BOOST_THROW_EXCEPTION(PosixException("rename() failed", errno));
 }
-
-EXPORT_COMPONENT(compat, CompatComponent);

diff --git a/components/compatido/compatidocomponent.cpp b/components/compatido/compatidocomponent.cpp
index 62181c0520cd938a659b32ee95cdc6160191af44..f5a4b4bb908c96a42e4743a20463560309665a20 100644 (file)
--- a/components/compatido/compatidocomponent.cpp
+++ b/components/compatido/compatidocomponent.cpp
@@ -21,6 +21,8 @@
 
 using namespace icinga;
 
+EXPORT_COMPONENT(compatido, CompatIdoComponent);
+
 const String CompatIdoComponent::DefaultSocketAddress = "127.0.0.1";
 const String CompatIdoComponent::DefaultSocketPort = "5668";
 const String CompatIdoComponent::DefaultInstanceName = "i2-default";
@@ -835,6 +837,3 @@ void CompatIdoComponent::DumpStatusData(void)
                DumpServiceStatus(service);
        }
 }
-
-
-EXPORT_COMPONENT(compatido, CompatIdoComponent);

diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index 3e8d9cfaab4d20e585ae3d265a904f5a373f79f8..5744b2dc730bdd78c53771d96c0641deeff1f3ab 100644 (file)
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -22,6 +22,8 @@
 
 using namespace icinga;
 
+EXPORT_COMPONENT(delegation, DelegationComponent);
+
 void DelegationComponent::Start(void)
 {
        m_DelegationTimer = boost::make_shared<Timer>();
@@ -203,5 +205,3 @@ void DelegationComponent::DelegationTimerHandler(void)
        msgbuf << "Updated delegations for " << delegated << " services";
        Logger::Write(LogInformation, "delegation", msgbuf.str());
 }
-
-EXPORT_COMPONENT(delegation, DelegationComponent);

diff --git a/components/demo/democomponent.cpp b/components/demo/democomponent.cpp
index 1b4ab06d79cd8c9c57fbb10c7181a3b68d977b67..e2657d078f07b6fb92e32b68e782313d2de76361 100644 (file)
--- a/components/demo/democomponent.cpp
+++ b/components/demo/democomponent.cpp
@@ -21,6 +21,8 @@
 
 using namespace icinga;
 
+EXPORT_COMPONENT(demo, DemoComponent);
+
 /**
  * Starts the component.
  */
@@ -71,5 +73,3 @@ void DemoComponent::HelloWorldRequestHandler(const Endpoint::Ptr& sender,
        Logger::Write(LogInformation, "demo", "Got 'hello world' from identity=" +
            (sender ? sender->GetName() : "(anonymous)"));
 }
-
-EXPORT_COMPONENT(demo, DemoComponent);

diff --git a/components/notification/notificationcomponent.cpp b/components/notification/notificationcomponent.cpp
index c2eb2542fd4be696ab3a508f7395d4fdc8e0186b..7dac914c1077438a1ea8ec0d8b0628137d0306bb 100644 (file)
--- a/components/notification/notificationcomponent.cpp
+++ b/components/notification/notificationcomponent.cpp
@@ -21,6 +21,8 @@
 
 using namespace icinga;
 
+EXPORT_COMPONENT(notification, NotificationComponent);
+
 /**
  * Starts the component.
  */
@@ -48,5 +50,3 @@ void NotificationComponent::NotificationTimerHandler(void)
 {
        // TODO: implement
 }
-
-EXPORT_COMPONENT(notification, NotificationComponent);

diff --git a/components/replication/replicationcomponent.cpp b/components/replication/replicationcomponent.cpp
index fee1d2a9635a03d59497796ee5a2d517c7b1b7f6..5995b9cf1a55a01172b9896a9e772f16c85d9b51 100644 (file)
--- a/components/replication/replicationcomponent.cpp
+++ b/components/replication/replicationcomponent.cpp
@@ -21,6 +21,8 @@
 
 using namespace icinga;
 
+EXPORT_COMPONENT(replication, ReplicationComponent);
+
 /**
  * Starts the component.
  */
@@ -248,5 +250,3 @@ void ReplicationComponent::RemoteObjectRemovedHandler(const RequestMessage& requ
                object->Unregister();
        }
 }
-
-EXPORT_COMPONENT(replication, ReplicationComponent);