adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

CTemplate: Switch from CSmartPtr to std::shared_ptr

Browse Source 
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2014-09-12 14:42:40 +02:00
parent f11fb62e62
commit 67d22c8e42
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/Template.h
+7 -6
View File
@@ -18,9 +18,10 @@
#define _TEMPLATE_H
#include <znc/zncconfig.h>
#include <znc/Utils.h>
#include <znc/ZNCString.h>
#include <iostream>
#include <list>
#include <memory>
class CTemplate;
@@ -124,7 +125,7 @@ public:
Init();
}
CTemplate(const CSmartPtr<CTemplateOptions>& Options, CTemplate* pParent = NULL) : MCString(), m_spOptions(Options) {
CTemplate(const std::shared_ptr<CTemplateOptions>& Options, CTemplate* pParent = NULL) : MCString(), m_spOptions(Options) {
Init();
m_pParent = pParent;
}
@@ -132,11 +133,11 @@ public:
virtual ~CTemplate();
//! Class for implementing custom tags in subclasses
void AddTagHandler(CSmartPtr<CTemplateTagHandler> spTagHandler) {
void AddTagHandler(std::shared_ptr<CTemplateTagHandler> spTagHandler) {
m_vspTagHandlers.push_back(spTagHandler);
}
std::vector<CSmartPtr<CTemplateTagHandler> >& GetTagHandlers() {
std::vector<std::shared_ptr<CTemplateTagHandler> >& GetTagHandlers() {
if (m_pParent) {
return m_pParent->GetTagHandlers();
}
@@ -182,8 +183,8 @@ private:
std::list<std::pair<CString, bool> > m_lsbPaths;
std::map<CString, std::vector<CTemplate*> > m_mvLoops;
std::vector<CTemplateLoopContext*> m_vLoopContexts;
CSmartPtr<CTemplateOptions> m_spOptions;
std::vector<CSmartPtr<CTemplateTagHandler> > m_vspTagHandlers;
std::shared_ptr<CTemplateOptions> m_spOptions;
std::vector<std::shared_ptr<CTemplateTagHandler> > m_vspTagHandlers;
};
#endif // !_TEMPLATE_H