Commit 14436c81 authored by Scott Cyphers's avatar Scott Cyphers

0 -> nullptr, non-std shared_ptr::make_shared -> std::make_shared

parent c302ab30
......@@ -27,7 +27,7 @@ namespace ngraph
public:
using ptr = std::shared_ptr<Node>;
Node(const std::vector<Node::ptr>& arguments, ValueType::ptr type = 0)
Node(const std::vector<Node::ptr>& arguments, ValueType::ptr type = nullptr)
: TypedValueMixin(type)
, m_arguments(arguments)
{
......
......@@ -36,7 +36,7 @@ namespace ngraph
Op::ptr op() const { return m_op; }
Call(const Op::ptr& op, const std::vector<Node::ptr>& arguments)
: Node(arguments, 0)
: Node(arguments, nullptr)
, m_op(op)
{
}
......@@ -89,7 +89,7 @@ namespace ngraph
public:
Call::ptr operator()(const Node::ptr& arg0, const Node::ptr& arg1)
{
return Call::ptr::make_shared(shared_from_this(), std::vector<Node::ptr>{arg0, arg1});
return std::make_shared<Call>(shared_from_this(), std::vector<Node::ptr>{arg0, arg1});
}
};
......
......@@ -99,7 +99,7 @@ namespace ngraph
class TypedValueMixin
{
public:
TypedValueMixin(const ValueType::ptr& type = 0)
TypedValueMixin(const ValueType::ptr& type = nullptr)
: m_type(type)
{
}
......@@ -117,7 +117,7 @@ namespace ngraph
**/
void type(const ElementType& element_type, const Shape& shape)
{
m_type = TensorViewType::ptr::make_shared(element_type, shape);
m_type = std::make_shared<TensorViewType>(element_type, shape);
}
/**
......
......@@ -29,6 +29,6 @@ Function::Function(size_t n_parameters)
{
for (int i = 0; i < n_parameters; i++)
{
m_parameters[i] = Parameter::ptr::make_shared(*this, i);
m_parameters[i] = std::make_shared<Parameter>(*this, i);
}
}
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