re-enabled the assignment operator of class symbol

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 94d01e4cfe8cefb74f302182c27f7cb511e6cef5..f099967cb095c349cba4a1b19320391c0b6fa2ad 100644 (file)
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -32,7 +32,7 @@
 
 namespace GiNaC {
 
 
 namespace GiNaC {
 

-GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(symbol, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS(symbol, basic)

 
 //////////
 // default ctor, dtor, copy ctor, assignment operator and helpers
 
 //////////
 // default ctor, dtor, copy ctor, assignment operator and helpers


@@ -53,7 +53,7 @@ void symbol::copy(const symbol & other)
        TeX_name = other.TeX_name;
        serial = other.serial;
        asexinfop = other.asexinfop;
        TeX_name = other.TeX_name;
        serial = other.serial;
        asexinfop = other.asexinfop;

-       ++asexinfop->refcount;
+       ++(asexinfop->refcount);

 }
 
 void symbol::destroy(bool call_parent)
 }
 
 void symbol::destroy(bool call_parent)


@@ -70,11 +70,6 @@ void symbol::destroy(bool call_parent)
 
 // public
 
 
 // public
 

-symbol::symbol(const symbol & other)
-{
-       copy(other);
-}
-

 symbol::symbol(const std::string & initname) : inherited(TINFO_symbol)
 {
        name = initname;
 symbol::symbol(const std::string & initname) : inherited(TINFO_symbol)
 {
        name = initname;


@@ -137,11 +132,6 @@ void symbol::archive(archive_node &n) const
 
 // public
 
 
 // public
 

-basic *symbol::duplicate() const
-{
-       return new symbol(*this);
-}
-

 void symbol::print(const print_context & c, unsigned level) const
 {
        if (is_a<print_tree>(c)) {
 void symbol::print(const print_context & c, unsigned level) const
 {
        if (is_a<print_tree>(c)) {

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 7c96312cf8aec70f7c0ac8141b603966e1db55d7..15490253eb9f0a2b54b3f620fd41f0d444cea42f 100644 (file)
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -37,7 +37,7 @@ namespace GiNaC {
  *  first place. */
 class symbol : public basic
 {
  *  first place. */
 class symbol : public basic
 {

-       GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(symbol, basic)
+       GINAC_DECLARE_REGISTERED_CLASS(symbol, basic)

        
 // types
        
        
 // types
        


@@ -52,15 +52,6 @@ class symbol : public basic
        
 // member functions
        
        
 // member functions
        

-       // default ctor, dtor, copy ctor, assignment operator and helpers
-public:
-       symbol();
-       ~symbol() { destroy(false); }
-       symbol(const symbol & other);
-protected:
-       void copy(const symbol & other); 
-       void destroy(bool call_parent);
-       

        // other ctors
 public:
        explicit symbol(const std::string & initname);
        // other ctors
 public:
        explicit symbol(const std::string & initname);


@@ -68,7 +59,6 @@ public:
        
        // functions overriding virtual functions from base classes
 public:
        
        // functions overriding virtual functions from base classes
 public:

-       basic * duplicate() const;

        void print(const print_context & c, unsigned level = 0) const;
        bool info(unsigned inf) const;
        ex eval(int level = 0) const;
        void print(const print_context & c, unsigned level = 0) const;
        bool info(unsigned inf) const;
        ex eval(int level = 0) const;


@@ -78,7 +68,6 @@ public:
        ex to_rational(lst &repl_lst) const;
 protected:
        ex derivative(const symbol & s) const;
        ex to_rational(lst &repl_lst) const;
 protected:
        ex derivative(const symbol & s) const;

-       int compare_same_type(const basic & other) const;

        bool is_equal_same_type(const basic & other) const;
        unsigned calchash(void) const;
        
        bool is_equal_same_type(const basic & other) const;
        unsigned calchash(void) const;