- Derivatives are now assembled in a slightly different manner (i.e. they

[ginac.git] / ginac / symbol.h

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 55f204499958984aa636c013d6548a74612d3f75..1a51ffb4dc5f6428b7ff75e0cb1689de3e3b5045 100644 (file)
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -70,19 +70,19 @@ public:
     // functions overriding virtual functions from base classes
 public:
     basic * duplicate() const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
+    void print(std::ostream & os, unsigned upper_precedence = 0) const;
+    void printraw(std::ostream & os) const;
+    void printtree(std::ostream & os, unsigned indent) const;
+    void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
     bool info(unsigned inf) const;
-    ex expand(unsigned options=0) const;
+    ex expand(unsigned options = 0) const;
     bool has(const ex & other) const;
     int degree(const symbol & s) const;
     int ldegree(const symbol & s) const;
     ex coeff(const symbol & s, int n = 1) const;
     ex eval(int level = 0) const;
-    ex series(const relational & s, int order) const;
-    ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
+    ex series(const relational & s, int order, bool branchcut = true) const;
+    ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
     ex to_rational(lst &repl_lst) const;
     ex subs(const lst & ls, const lst & lr) const;
 protected:
@@ -97,8 +97,8 @@ protected:
 public:
     void assign(const ex & value);
     void unassign(void);
-    void setname(const std::string & n) {name=n;}
-    std::string getname(void) const {return name;}
+    void setname(const std::string & n) { name = n; }
+    std::string getname(void) const { return name; }
 private:
     std::string & autoname_prefix(void);