Skip to content

Commit

Permalink
Replace boost::shared_ptr , boost::weak_ptr , boost::enable_shared_fr…
Browse files Browse the repository at this point in the history
…om_this with std:: ones
  • Loading branch information
mariuz committed Jan 10, 2017
1 parent aff9e9a commit 1b78642
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 40 deletions.
1 change: 0 additions & 1 deletion src/gui/PreferencesDialogSettings.cpp
Expand Up @@ -40,7 +40,6 @@

#include <vector>

#include <boost/bind.hpp>
#include <boost/scoped_ptr.hpp>
#include <functional>

Expand Down
60 changes: 30 additions & 30 deletions src/metadata/MetadataClasses.h
Expand Up @@ -30,104 +30,104 @@
#include <boost/shared_ptr.hpp>

class Column;
typedef boost::shared_ptr<Column> ColumnPtr;
typedef std::shared_ptr<Column> ColumnPtr;
typedef std::vector<ColumnPtr> ColumnPtrs;

class Database;
typedef boost::shared_ptr<Database> DatabasePtr;
typedef boost::weak_ptr<Database> DatabaseWeakPtr;
typedef std::shared_ptr<Database> DatabasePtr;
typedef std::weak_ptr<Database> DatabaseWeakPtr;
typedef std::vector<DatabasePtr> DatabasePtrs;

class Domain;
typedef boost::shared_ptr<Domain> DomainPtr;
typedef std::shared_ptr<Domain> DomainPtr;
typedef std::vector<DomainPtr> DomainPtrs;
class Domains;
typedef boost::shared_ptr<Domains> DomainsPtr;
typedef std::shared_ptr<Domains> DomainsPtr;

class Exception;
typedef boost::shared_ptr<Exception> ExceptionPtr;
typedef std::shared_ptr<Exception> ExceptionPtr;
typedef std::vector<ExceptionPtr> ExceptionPtrs;
class Exceptions;
typedef boost::shared_ptr<Exceptions> ExceptionsPtr;
typedef std::shared_ptr<Exceptions> ExceptionsPtr;

class ForeignKey;

class Function;
typedef boost::shared_ptr<Function> FunctionPtr;
typedef std::shared_ptr<Function> FunctionPtr;
typedef std::vector<FunctionPtr> FunctionPtrs;
class Functions;
typedef boost::shared_ptr<Functions> FunctionsPtr;
typedef std::shared_ptr<Functions> FunctionsPtr;

class Generator;
typedef boost::shared_ptr<Generator> GeneratorPtr;
typedef std::shared_ptr<Generator> GeneratorPtr;
typedef std::vector<GeneratorPtr> GeneratorPtrs;
class Generators;
typedef boost::shared_ptr<Generators> GeneratorsPtr;
typedef std::shared_ptr<Generators> GeneratorsPtr;

class Index;

class MetadataItem;
typedef boost::shared_ptr<MetadataItem> MetadataItemPtr;
typedef std::shared_ptr<MetadataItem> MetadataItemPtr;

class Parameter;
typedef boost::shared_ptr<Parameter> ParameterPtr;
typedef std::shared_ptr<Parameter> ParameterPtr;
typedef std::vector<ParameterPtr> ParameterPtrs;

class PrimaryKeyConstraint;

class Procedure;
typedef boost::shared_ptr<Procedure> ProcedurePtr;
typedef std::shared_ptr<Procedure> ProcedurePtr;
typedef std::vector<ProcedurePtr> ProcedurePtrs;
class Procedures;
typedef boost::shared_ptr<Procedures> ProceduresPtr;
typedef std::shared_ptr<Procedures> ProceduresPtr;

class Relation;

class Role;
typedef boost::shared_ptr<Role> RolePtr;
typedef std::shared_ptr<Role> RolePtr;
typedef std::vector<RolePtr> RolePtrs;
class Roles;
typedef boost::shared_ptr<Roles> RolesPtr;
typedef std::shared_ptr<Roles> RolesPtr;

class Root;
typedef boost::shared_ptr<Root> RootPtr;
typedef std::shared_ptr<Root> RootPtr;

class Server;
typedef boost::shared_ptr<Server> ServerPtr;
typedef boost::weak_ptr<Server> ServerWeakPtr;
typedef std::shared_ptr<Server> ServerPtr;
typedef std::weak_ptr<Server> ServerWeakPtr;
typedef std::vector<ServerPtr> ServerPtrs;

class SysDomains;
typedef boost::shared_ptr<SysDomains> SysDomainsPtr;
typedef std::shared_ptr<SysDomains> SysDomainsPtr;

class SysRoles;
typedef boost::shared_ptr<SysRoles> SysRolesPtr;
typedef std::shared_ptr<SysRoles> SysRolesPtr;

class SysTables;
typedef boost::shared_ptr<SysTables> SysTablesPtr;
typedef std::shared_ptr<SysTables> SysTablesPtr;

class Table;
typedef boost::shared_ptr<Table> TablePtr;
typedef std::shared_ptr<Table> TablePtr;
typedef std::vector<TablePtr> TablePtrs;
class Tables;
typedef boost::shared_ptr<Tables> TablesPtr;
typedef std::shared_ptr<Tables> TablesPtr;

class Trigger;
typedef boost::shared_ptr<Trigger> TriggerPtr;
typedef std::shared_ptr<Trigger> TriggerPtr;
typedef std::vector<TriggerPtr> TriggerPtrs;
class Triggers;
typedef boost::shared_ptr<Triggers> TriggersPtr;
typedef std::shared_ptr<Triggers> TriggersPtr;

class UniqueConstraint;

class User;
typedef boost::shared_ptr<User> UserPtr;
typedef std::shared_ptr<User> UserPtr;
typedef std::vector<UserPtr> UserPtrs;

class View;
typedef boost::shared_ptr<View> ViewPtr;
typedef std::shared_ptr<View> ViewPtr;
typedef std::vector<ViewPtr> ViewPtrs;
class Views;
typedef boost::shared_ptr<Views> ViewsPtr;
typedef std::shared_ptr<Views> ViewsPtr;

#endif // FR_METADATACLASSES_H
4 changes: 2 additions & 2 deletions src/metadata/MetadataItemURIHandlerHelper.h
Expand Up @@ -41,11 +41,11 @@ class MetadataItemURIHandlerHelper
}

template<class T>
boost::shared_ptr<T> extractMetadataItemPtrFromURI(const URI& uri)
std::shared_ptr<T> extractMetadataItemPtrFromURI(const URI& uri)
{
if (T* t = extractMetadataItemFromURI<T>(uri))
return t->shared_from_this();
return boost::shared_ptr<T>();
return std::shared_ptr<T>();
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/metadata/MetadataTemplateManager.h
Expand Up @@ -62,7 +62,7 @@ class TemplateDescriptor
wxString getBaseFileName() const { return templateFileNameM.GetName(); }
};

typedef boost::shared_ptr<TemplateDescriptor> TemplateDescriptorPtr;
typedef std::shared_ptr<TemplateDescriptor> TemplateDescriptorPtr;
typedef std::list<TemplateDescriptorPtr> TemplateDescriptorList;

class MetadataTemplateManager
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/User.h
Expand Up @@ -31,7 +31,7 @@
#include "metadata/metadataitem.h"

class User: public MetadataItem,
public boost::enable_shared_from_this<User>
public std::enable_shared_from_this<User>
{
private:
ServerWeakPtr serverM;
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/collection.h
Expand Up @@ -81,7 +81,7 @@ template <class T>
class MetadataCollection : public MetadataCollectionBase
{
public:
typedef typename boost::shared_ptr<T> ItemType;
typedef typename std::shared_ptr<T> ItemType;
typedef typename std::vector<ItemType> CollectionType;
typedef typename CollectionType::iterator iterator;
typedef typename CollectionType::const_iterator const_iterator;
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/database.cpp
Expand Up @@ -925,7 +925,7 @@ void Database::reconnect()
}

class BackgroundTask;
typedef boost::shared_ptr<BackgroundTask> SharedBackgroundTask;
typedef std::shared_ptr<BackgroundTask> SharedBackgroundTask;

class BackgroundTask
{
Expand Down
4 changes: 2 additions & 2 deletions src/metadata/database.h
Expand Up @@ -144,7 +144,7 @@ class DatabaseAuthenticationMode
};

class Database: public MetadataItem,
public boost::enable_shared_from_this<Database>
public std::enable_shared_from_this<Database>
{
private:
ServerWeakPtr serverM;
Expand Down Expand Up @@ -181,7 +181,7 @@ class Database: public MetadataItem,
ViewsPtr viewsM;

// copy constructor implementation removed since it's no longer needed
// (Server uses a vector of boost::shared_ptr<Database> now)
// (Server uses a vector of std::shared_ptr<Database> now)
Database(const Database& rhs);

void setDisconnected();
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/server.h
Expand Up @@ -36,7 +36,7 @@
#include "metadata/User.h"

class Server : public MetadataItem,
public boost::enable_shared_from_this<Server>
public std::enable_shared_from_this<Server>
{
private:
wxString hostnameM;
Expand Down

0 comments on commit 1b78642

Please sign in to comment.