- configure.in: bumped up version.

[ginac.git] / ginac / utils.cpp

diff --git a/ginac/utils.cpp b/ginac/utils.cpp
index 374f3bc4fc7808a20c0cdf570fc360481af5e190..75b0e84fde90946ea897b47242cc073a66f6b016 100644 (file)
--- a/ginac/utils.cpp
+++ b/ginac/utils.cpp
@@ -26,9 +26,7 @@
 #include "utils.h"
 #include "version.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /* Version information buried into the library */
 const int version_major = GINACLIB_MAJOR_VERSION;
@@ -55,30 +53,12 @@ int pole_error::degree(void) const
 unsigned log2(unsigned n)
 {
        unsigned k;
-       for (k = 0; n > 1; n >>= 1) ++k;
+       for (k = 0; n > 1; n >>= 1)
+               ++k;
        return k;
 }
 #endif
 
-/** Compare two pointers (just to establish some sort of canonical order).
- *  @return -1, 0, or 1 */
-int compare_pointers(const void * a, const void * b)
-{
-       if (a<b) {
-               return -1;
-       } else if (a>b) {
-               return 1;
-       }
-       return 0;
-}
-
-/** Append one exvector to another */
-void append_exvector_to_exvector(exvector & dest, const exvector & source)
-{
-       dest.reserve(dest.size() + source.size());
-       dest.insert(dest.end(), source.begin(), source.end());
-}
-
 //////////
 // `construct on first use' chest of numbers
 //////////
@@ -774,13 +754,13 @@ const ex & _ex120(void)
 
 // member functions
 
-       // default constructor, destructor, copy constructor assignment operator and helpers
+       // default ctor, dtor, copy ctor assignment operator and helpers
        // none
 
-       // other constructors
+       // other ctors
        // none
 
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
        // none
        
        // new virtual functions which can be overridden by derived classes
@@ -798,21 +778,21 @@ const ex & _ex120(void)
 
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor assignment operator and helpers
 //////////
 
 // public
 // protected
 
 //////////
-// other constructors
+// other ctors
 //////////
 
 // public
 // none
 
 //////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
 //////////
 
 // public
@@ -844,6 +824,4 @@ const ex & _ex120(void)
 // none
 
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC