X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns.cpp;h=0a38c4b0f4f47d07abdb2eba780a78194b5ed420;hp=5eb4466cc72b710865d8842e4aa935fecdc858f5;hb=955cb185a85535ab328ffedbfccdc508ce80fa91;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 5eb4466c..0a38c4b0 100644
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -35,20 +35,23 @@
 #include "relational.h"
 #include "series.h"
 #include "symbol.h"
+#include "utils.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;
-    if (x.is_equal(exONE()))
+    if (x.is_equal(_ex1()))
         return power(Pi, 2) / 6;
-    if (x.is_equal(exMINUSONE()))
+    if (x.is_equal(_ex_1()))
         return -power(Pi, 2) / 12;
     return Li2(x).hold();
 }
@@ -59,7 +62,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;
@@ -72,12 +75,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));
@@ -91,12 +94,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));
@@ -110,12 +113,12 @@ 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)) {
 
 		// O(c)=O(1)
-		return Order(exONE()).hold();
+		return Order(_ex1()).hold();
 
 	} else if (is_ex_exactly_of_type(x, mul)) {
 
@@ -129,11 +132,11 @@ 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;
-	new_seq.push_back(expair(Order(exONE()), numeric(min(x.ldegree(s), order))));
+	new_seq.push_back(expair(Order(_ex1()), numeric(min(x.ldegree(s), order))));
 	return series(s, point, new_seq);
 }
 
@@ -149,8 +152,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
     }
@@ -208,7 +211,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();
     }
     
@@ -235,7 +238,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
 ex ncpower(ex const &basis, unsigned exponent)
 {
     if (exponent==0) {
-        return exONE();
+        return _ex1();
     }
 
     exvector v;
@@ -247,4 +250,11 @@ 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_zeta1 = function_index_zeta1;
+
+#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE