Change to std::string

src/ngraph/function.hpp

@@ -33,11 +33,7 @@ namespace ngraph
 
         Parameter(Function& function, size_t index);
 
-        const std::string& description() const override
-        {
-            static std::string name{"Parameter"};
-            return name;
-        }
+        std::string description() const override { return "Parameter"; }
 
     protected:
         Function& m_function;
@@ -72,7 +68,7 @@ namespace ngraph
 
         Parameter::ptr parameter(size_t i) { return m_parameters[i]; }
 
-        const std::string& name() const override { return m_name; }
+        std::string name() const override { return m_name; }
 
     protected:
         std::vector<Parameter::ptr> m_parameters;

src/ngraph/node.hpp

@@ -50,7 +50,7 @@ namespace ngraph
 
     public:
         /// A "one-liner" describing this node.
-        virtual const std::string& description() const = 0;
+        virtual std::string description() const = 0;
 
         /// Propagate types and check arguments for consistency
         // virtual void propagate_types() = 0;
@@ -61,8 +61,8 @@ namespace ngraph
         const std::multiset<Node*> users() const { return m_users; }
         std::multiset<Node*>       users() { return m_users; }
 
-        const std::string& name() const { return m_name; }
-        void               name(const std::string& name) { m_name = name; }
+        std::string name() const { return m_name; }
+        void        name(const std::string& name) { m_name = name; }
 
     protected:
         std::vector<Node::ptr> m_arguments;

src/ngraph/op.hpp

@@ -30,7 +30,7 @@ namespace ngraph
         virtual ~Op() {}
 
     public:
-        virtual const std::string& name() const = 0;
+        virtual std::string name() const = 0;
     };
 
     /**
@@ -49,7 +49,7 @@ namespace ngraph
         {
         }
 
-        const std::string& description() const override { return m_op->name(); }
+        virtual std::string description() const override { return m_op->name(); }
 
     protected:
         std::shared_ptr<Op> m_op;
@@ -69,7 +69,7 @@ namespace ngraph
         }
 
     public:
-        const std::string& name() const override { return m_name; }
+        std::string name() const override { return m_name; }
 
     protected:
         std::string m_name;
@@ -78,11 +78,7 @@ namespace ngraph
     class BuiltinCall : public Call
     {
     public:
-        const std::string& description() const override
-        {
-            static std::string name{"BuiltinCall "};
-            return name;
-        }
+        virtual std::string description() const override { return "BuiltinCall"; }
 
     protected:
         BuiltinCall(const std::shared_ptr<Op>& op, const std::vector<Node::ptr>& args)

src/ngraph/type.hpp

@@ -59,7 +59,7 @@ namespace ngraph
 
     protected:
         const element::Type& m_element_type;
-        Shape              m_shape;
+        Shape                m_shape;
     };
 
     /**