#ifndef around namespace GiNaC { }

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index f9b797ee6eeb7d2297355538a5337cfecf5136a1..25eaae0d9a2939dc15bd59dbe118d9f12ac80d58 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -36,11 +36,15 @@
 #include "series.h"
 #include "symbol.h"
 
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
 //////////
 // dilogarithm
 //////////
 
-ex Li2_eval(ex const & x)
+static ex Li2_eval(ex const & x)
 {
     if (x.is_zero())
         return x;
@@ -57,7 +61,7 @@ REGISTER_FUNCTION(Li2, Li2_eval, NULL, NULL, NULL);
 // trilogarithm
 //////////
 
-ex Li3_eval(ex const & x)
+static ex Li3_eval(ex const & x)
 {
     if (x.is_zero())
         return x;
@@ -70,12 +74,12 @@ REGISTER_FUNCTION(Li3, Li3_eval, NULL, NULL, NULL);
 // factorial
 //////////
 
-ex factorial_evalf(ex const & x)
+static ex factorial_evalf(ex const & x)
 {
     return factorial(x).hold();
 }
 
-ex factorial_eval(ex const & x)
+static ex factorial_eval(ex const & x)
 {
     if (is_ex_exactly_of_type(x, numeric))
         return factorial(ex_to_numeric(x));
@@ -89,12 +93,12 @@ REGISTER_FUNCTION(factorial, factorial_eval, factorial_evalf, NULL, NULL);
 // binomial
 //////////
 
-ex binomial_evalf(ex const & x, ex const & y)
+static ex binomial_evalf(ex const & x, ex const & y)
 {
     return binomial(x, y).hold();
 }
 
-ex binomial_eval(ex const & x, ex const &y)
+static ex binomial_eval(ex const & x, ex const &y)
 {
     if (is_ex_exactly_of_type(x, numeric) && is_ex_exactly_of_type(y, numeric))
         return binomial(ex_to_numeric(x), ex_to_numeric(y));
@@ -108,7 +112,7 @@ REGISTER_FUNCTION(binomial, binomial_eval, binomial_evalf, NULL, NULL);
 // Order term function (for truncated power series)
 //////////
 
-ex Order_eval(ex const & x)
+static ex Order_eval(ex const & x)
 {
        if (is_ex_exactly_of_type(x, numeric)) {
 
@@ -127,7 +131,7 @@ ex Order_eval(ex const & x)
        return Order(x).hold();
 }
 
-ex Order_series(ex const & x, symbol const & s, ex const & point, int order)
+static ex Order_series(ex const & x, symbol const & s, ex const & point, int order)
 {
        // Just wrap the function into a series object
        epvector new_seq;
@@ -147,8 +151,8 @@ ex lsolve(ex const &eqns, ex const &symbols)
         }
         ex sol=lsolve(lst(eqns),lst(symbols));
         
-        ASSERT(sol.nops()==1);
-        ASSERT(is_ex_exactly_of_type(sol.op(0),relational));
+        GINAC_ASSERT(sol.nops()==1);
+        GINAC_ASSERT(is_ex_exactly_of_type(sol.op(0),relational));
         
         return sol.op(0).op(1); // return rhs of first solution
     }
@@ -206,7 +210,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
     } catch (runtime_error const & e) {
         // probably singular matrix (or other error)
         // return empty solution list
-        cerr << e.what() << endl;
+        // cerr << e.what() << endl;
         return lst();
     }
     
@@ -244,3 +248,12 @@ ex ncpower(ex const &basis, unsigned exponent)
 
     return ncmul(v,1);
 }
+
+/** Force inclusion of functions from initcns_gamma and inifcns_zeta
+ *  for static lib (so ginsh will see them). */
+unsigned force_include_gamma = function_index_gamma;
+unsigned force_include_zeta = function_index_zeta;
+
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE