Commit 33edd95a authored by Ronan's avatar Ronan

fix(Core): remove useless includes

parent e536ded3
...@@ -20,12 +20,10 @@ ...@@ -20,12 +20,10 @@
#ifndef _OBJECT_P_H_ #ifndef _OBJECT_P_H_
#define _OBJECT_P_H_ #define _OBJECT_P_H_
#include <memory>
#include <unordered_map> #include <unordered_map>
#include "base-object-p.h" #include "base-object-p.h"
#include "object.h" #include "object.h"
#include "variant/variant.h"
// ============================================================================= // =============================================================================
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include "logger/logger.h" #include "logger/logger.h"
#include "object-p.h" #include "object-p.h"
#include "object.h"
// ============================================================================= // =============================================================================
using namespace std; using namespace std;
......
...@@ -41,8 +41,6 @@ class LINPHONE_PUBLIC Object : ...@@ -41,8 +41,6 @@ class LINPHONE_PUBLIC Object :
friend class ObjectFactory; friend class ObjectFactory;
public: public:
virtual ~Object () = default;
std::shared_ptr<Object> getSharedFromThis (); std::shared_ptr<Object> getSharedFromThis ();
std::shared_ptr<const Object> getSharedFromThis () const; std::shared_ptr<const Object> getSharedFromThis () const;
......
...@@ -36,9 +36,11 @@ public: ...@@ -36,9 +36,11 @@ public:
PropertyContainer::PropertyContainer () : mPrivate(new PropertyContainerPrivate) {} PropertyContainer::PropertyContainer () : mPrivate(new PropertyContainerPrivate) {}
// Empty copy constructor. Don't change this pattern. /*
// PropertyContainer is an Entity component, not a simple structure. * Empty copy constructor. Don't change this pattern.
// An Entity is UNIQUE. * PropertyContainer is an Entity component, not a simple structure.
* An Entity is UNIQUE.
*/
PropertyContainer::PropertyContainer (const PropertyContainer &) : mPrivate(new PropertyContainerPrivate) {} PropertyContainer::PropertyContainer (const PropertyContainer &) : mPrivate(new PropertyContainerPrivate) {}
PropertyContainer::~PropertyContainer () { PropertyContainer::~PropertyContainer () {
......
...@@ -94,10 +94,10 @@ string Utils::toString (const void *val) { ...@@ -94,10 +94,10 @@ string Utils::toString (const void *val) {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#define STRING_TO_NUMBER_IMPL(TYPE, SUFFIX) \ #define STRING_TO_NUMBER_IMPL(TYPE, SUFFIX) \
TYPE Utils::sto ## SUFFIX(const string &str, size_t *idx, int base) { \ TYPE Utils::sto ## SUFFIX (const string &str, size_t *idx, int base) { \
return sto ## SUFFIX(str.c_str(), idx, base); \ return sto ## SUFFIX(str.c_str(), idx, base); \
} \ } \
TYPE Utils::sto ## SUFFIX(const char *str, size_t *idx, int base) { \ TYPE Utils::sto ## SUFFIX (const char *str, size_t *idx, int base) { \
char *p; \ char *p; \
TYPE v = strto ## SUFFIX(str, &p, base); \ TYPE v = strto ## SUFFIX(str, &p, base); \
if (idx) \ if (idx) \
......
...@@ -77,6 +77,8 @@ private: ...@@ -77,6 +77,8 @@ private:
int type = Variant::Invalid; int type = Variant::Invalid;
}; };
// -----------------------------------------------------------------------------
Variant::Variant () { Variant::Variant () {
// Private can exist. (placement new) // Private can exist. (placement new)
if (!mPrivate) if (!mPrivate)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment