Removed custom new_object function.

diff --git a/base/application.cpp b/base/application.cpp
index df4949ab066bdf706df0bff7c4fa2921dbcc3ec3..3e63ebc2e393704d43a5ba0d81ca1e45ca9fc3ea 100644 (file)
--- a/base/application.cpp
+++ b/base/application.cpp
@@ -18,7 +18,7 @@ Application::Application(void)
 #endif /* _WIN32 */
 
        m_ShuttingDown = false;
-       m_ConfigHive = new_object<ConfigHive>();
+       m_ConfigHive = make_shared<ConfigHive>();
 }
 
 Application::~Application(void)
@@ -94,7 +94,7 @@ void Application::RunEventLoop(void)
                else if (ready == 0)
                        continue;
 
-               EventArgs::Ptr ea = new_object<EventArgs>();
+               EventArgs::Ptr ea = make_shared<EventArgs>();
                ea->Source = shared_from_this();
 
                list<Socket::WeakPtr>::iterator prev, i;

diff --git a/base/application.h b/base/application.h
index 72940ba64ec3e7747766acb703e9639f0a3cf330..b532a5d4d2862377f1e88b7ad4f32a0146da26a0 100644 (file)
--- a/base/application.h
+++ b/base/application.h
@@ -49,7 +49,7 @@ int application_main(int argc, char **argv)
 {
        int result;
 
-       Application::Instance = new_object<T>();
+       Application::Instance = make_shared<T>();
 
        vector<string> args;
 

diff --git a/base/confighive.cpp b/base/confighive.cpp
index 9463b34832d016819bbf1446cbc790697334a487..a76734a8ab24bfc82bda8031447148fc5c4a54a8 100644 (file)
--- a/base/confighive.cpp
+++ b/base/confighive.cpp
@@ -17,7 +17,7 @@ void ConfigHive::AddObject(const ConfigObject::Ptr& object)
        string name = object->GetName();
        ti->second[name] = object;
 
-       ConfigHiveEventArgs::Ptr ea = new_object<ConfigHiveEventArgs>();
+       ConfigHiveEventArgs::Ptr ea = make_shared<ConfigHiveEventArgs>();
        ea->Source = shared_from_this();
        ea->Object = object;
        OnObjectCreated(ea);
@@ -33,7 +33,7 @@ void ConfigHive::RemoveObject(const ConfigObject::Ptr& object)
 
        ti->second.erase(object->GetName());
 
-       ConfigHiveEventArgs::Ptr ea = new_object<ConfigHiveEventArgs>();
+       ConfigHiveEventArgs::Ptr ea = make_shared<ConfigHiveEventArgs>();
        ea->Source = shared_from_this();
        ea->Object = object;
        OnObjectRemoved(ea);

diff --git a/base/configobject.cpp b/base/configobject.cpp
index 3542bf43ad16e9fc4aa0a050cfd2c4ad20f211e9..35b9a0df7352896e3c2070540832239352b1b8c7 100644 (file)
--- a/base/configobject.cpp
+++ b/base/configobject.cpp
@@ -38,7 +38,7 @@ void ConfigObject::SetProperty(const string& name, const string& value)
 
        ConfigHive::Ptr hive = m_Hive.lock();
        if (hive.get() != NULL) {
-               ConfigHiveEventArgs::Ptr ea = new_object<ConfigHiveEventArgs>();
+               ConfigHiveEventArgs::Ptr ea = make_shared<ConfigHiveEventArgs>();
                ea->Source = hive;
                ea->Object = static_pointer_cast<ConfigObject>(shared_from_this());
                ea->Property = name;

diff --git a/base/object.h b/base/object.h
index 00096adcd392b47e86bd9959b91a165df402fa8c..71c278ead3e6238938296b76953a228a4fa55c00 100644 (file)
--- a/base/object.h
+++ b/base/object.h
@@ -36,36 +36,12 @@ public:
        }
 };
 
-template<class T>
-shared_ptr<T> new_object(void)
-{
-       T *instance = new T();
-
-       return shared_ptr<T>(instance);
-}
-
-template<class T, class TArg1>
-shared_ptr<T> new_object(const TArg1& arg1)
-{
-       T *instance = new T(arg1);
-
-       return shared_ptr<T>(instance);
-}
-
-template<class T, class TArg1, class TArg2>
-shared_ptr<T> new_object(const TArg1& arg1, const TArg2& arg2)
-{
-       T *instance = new T(arg1, arg2);
-
-       return shared_ptr<T>(instance);
-}
-
 typedef function<Object::Ptr ()> factory_function;
 
 template<class T>
 Object::Ptr factory(void)
 {
-       return new_object<T>();
+       return make_shared<T>();
 }
 
 }

diff --git a/base/socket.cpp b/base/socket.cpp
index db6332cdcb3d961b36beee3860f62c47e48bc977..2371ad854241f08f708ef12134e5c18f93c30e0c 100644 (file)
--- a/base/socket.cpp
+++ b/base/socket.cpp
@@ -52,7 +52,7 @@ void Socket::Close(bool from_dtor)
 
                /* nobody can possibly have a valid event subscription when the destructor has been called */
                if (!from_dtor) {
-                       EventArgs::Ptr ea = new_object<EventArgs>();
+                       EventArgs::Ptr ea = make_shared<EventArgs>();
                        ea->Source = shared_from_this();
                        OnClosed(ea);
                }

diff --git a/base/tcpclient.cpp b/base/tcpclient.cpp
index bdcca575a48dbf3321647eda35062c17e4ca5c53..595be920335809de9ac74c63b6fb14790d38905b 100644 (file)
--- a/base/tcpclient.cpp
+++ b/base/tcpclient.cpp
@@ -4,8 +4,8 @@ using namespace icinga;
 
 TCPClient::TCPClient(void)
 {
-       m_SendQueue = new_object<FIFO>();
-       m_RecvQueue = new_object<FIFO>();
+       m_SendQueue = make_shared<FIFO>();
+       m_RecvQueue = make_shared<FIFO>();
 }
 
 void TCPClient::Start(void)
@@ -48,7 +48,7 @@ int TCPClient::ReadableEventHandler(EventArgs::Ptr ea)
 
        m_RecvQueue->Write(NULL, rc);
 
-       EventArgs::Ptr dea = new_object<EventArgs>();
+       EventArgs::Ptr dea = make_shared<EventArgs>();
        dea->Source = shared_from_this();
        OnDataAvailable(dea);
 

diff --git a/base/tcpserver.cpp b/base/tcpserver.cpp
index 4c8e5b6b13095c8cfad48fccb00fedf1ebcfb388..bb8f6718c66a6d52d6440bc13f6855543d7fee8d 100644 (file)
--- a/base/tcpserver.cpp
+++ b/base/tcpserver.cpp
@@ -39,7 +39,7 @@ int TCPServer::ReadableEventHandler(EventArgs::Ptr ea)
 
        fd = accept(GetFD(), (sockaddr *)&addr, &addrlen);
 
-       NewClientEventArgs::Ptr nea = new_object<NewClientEventArgs>();
+       NewClientEventArgs::Ptr nea = make_shared<NewClientEventArgs>();
        nea->Source = shared_from_this();
        nea->Client = static_pointer_cast<TCPSocket>(m_ClientFactory());
        nea->Client->SetFD(fd);

diff --git a/base/timer.cpp b/base/timer.cpp
index ad7d7b03f7e20604c21978bdc56017aa47c66260..817ae2f8896e9aff8f55fa3a7a0a362a8aa121e1 100644 (file)
--- a/base/timer.cpp
+++ b/base/timer.cpp
@@ -74,7 +74,7 @@ void Timer::StopAllTimers(void)
  * the timer that originally invoked the delegate */
 void Timer::Call(void)
 {
-       TimerEventArgs::Ptr ea = new_object<TimerEventArgs>();
+       TimerEventArgs::Ptr ea = make_shared<TimerEventArgs>();
        ea->Source = shared_from_this();
        ea->UserArgs = m_UserArgs;
        OnTimerExpired(ea);

diff --git a/configfilecomponent/configfilecomponent.cpp b/configfilecomponent/configfilecomponent.cpp
index 688b88878f5860b63749ef5a594bf3353b1fa115..30f166256b3a5ba37aa19d6f8643c62af971f429 100644 (file)
--- a/configfilecomponent/configfilecomponent.cpp
+++ b/configfilecomponent/configfilecomponent.cpp
@@ -13,7 +13,7 @@ string ConfigFileComponent::GetName(void)
 void ConfigFileComponent::Start(void)
 {
        ifstream fp;
-       FIFO::Ptr fifo = new_object<FIFO>();
+       FIFO::Ptr fifo = make_shared<FIFO>();
 
        string filename;
        if (!GetConfig()->GetProperty("configFilename", &filename))
@@ -51,7 +51,7 @@ void ConfigFileComponent::Start(void)
                for (cJSON *object = typeobj->child; object != NULL; object = object->next) {
                        string name = object->string;
 
-                       ConfigObject::Ptr cfgobj = new_object<ConfigObject>();
+                       ConfigObject::Ptr cfgobj = make_shared<ConfigObject>();
                        cfgobj->SetName(name);
                        cfgobj->SetType(type);
 

diff --git a/configrpccomponent/configrpccomponent.cpp b/configrpccomponent/configrpccomponent.cpp
index 20a42550238e26673cf8b214aaabe1ecc90c9485..43aeebc79d0ab838cae11e6a0fd3fe5d0f9ec1ab 100644 (file)
--- a/configrpccomponent/configrpccomponent.cpp
+++ b/configrpccomponent/configrpccomponent.cpp
@@ -40,7 +40,7 @@ void ConfigRpcComponent::Stop(void)
 
 JsonRpcMessage::Ptr ConfigRpcComponent::MakeObjectMessage(const ConfigObject::Ptr& object, string method, bool includeProperties)
 {
-       JsonRpcMessage::Ptr msg = new_object<JsonRpcMessage>();
+       JsonRpcMessage::Ptr msg = make_shared<JsonRpcMessage>();
        msg->SetVersion("2.0");
        msg->SetMethod(method);
        cJSON *params = msg->GetParams();

diff --git a/icinga/icingaapplication.cpp b/icinga/icingaapplication.cpp
index f882d7027cee397bd38db0b7e2ef220387a71943..344cebfa54733ae060a865be86966d5aacb220a1 100644 (file)
--- a/icinga/icingaapplication.cpp
+++ b/icinga/icingaapplication.cpp
@@ -11,7 +11,7 @@ using namespace icinga;
 
 IcingaApplication::IcingaApplication(void)
 {
-       m_ConnectionManager = new_object<ConnectionManager>();
+       m_ConnectionManager = make_shared<ConnectionManager>();
 }
 
 int IcingaApplication::Main(const vector<string>& args)
@@ -33,7 +33,7 @@ int IcingaApplication::Main(const vector<string>& args)
        GetConfigHive()->OnObjectCreated += bind_weak(&IcingaApplication::ConfigObjectCreatedHandler, shared_from_this());
        GetConfigHive()->OnObjectRemoved += bind_weak(&IcingaApplication::ConfigObjectRemovedHandler, shared_from_this());
 
-       ConfigObject::Ptr fileComponentConfig = new_object<ConfigObject>();
+       ConfigObject::Ptr fileComponentConfig = make_shared<ConfigObject>();
        fileComponentConfig->SetName("configfilecomponent");
        fileComponentConfig->SetType("component");
        fileComponentConfig->SetProperty("configFilename", args[1]);

diff --git a/jsonrpc/connectionmanager.cpp b/jsonrpc/connectionmanager.cpp
index 67151bef0349f9133fa603614b4376dca1809307..681d5fb0bc129a96aa5e3b19ff41a885e506cdb9 100644 (file)
--- a/jsonrpc/connectionmanager.cpp
+++ b/jsonrpc/connectionmanager.cpp
@@ -50,7 +50,7 @@ int ConnectionManager::NewMessageHandler(NewMessageEventArgs::Ptr nmea)
        i = m_Methods.find(request->GetMethod());
 
        if (i == m_Methods.end()) {
-               JsonRpcMessage::Ptr response = new_object<JsonRpcMessage>();
+               JsonRpcMessage::Ptr response = make_shared<JsonRpcMessage>();
                response->SetVersion("2.0");
                response->SetError("Unknown method.");
                response->SetID(request->GetID());

diff --git a/jsonrpc/jsonrpcclient.cpp b/jsonrpc/jsonrpcclient.cpp
index 34db54c0759f9a650ee3d81bb3b2b365046a4dee..e449b33e925492cfbdca9b1824cfe75d1355de3b 100644 (file)
--- a/jsonrpc/jsonrpcclient.cpp
+++ b/jsonrpc/jsonrpcclient.cpp
@@ -30,9 +30,9 @@ int JsonRpcClient::DataAvailableHandler(EventArgs::Ptr ea)
                if (json == NULL)
                        break;
 
-               JsonRpcMessage::Ptr msg = new_object<JsonRpcMessage>();
+               JsonRpcMessage::Ptr msg = make_shared<JsonRpcMessage>();
                msg->SetJSON(json);
-               NewMessageEventArgs::Ptr nea = new_object<NewMessageEventArgs>();
+               NewMessageEventArgs::Ptr nea = make_shared<NewMessageEventArgs>();
                nea->Source = shared_from_this();
                nea->Message = msg;
                OnNewMessage(nea);