X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Futils.cpp;h=7acb3a983d9237fc940524b587701e2a660820b7;hp=374f3bc4fc7808a20c0cdf570fc360481af5e190;hb=0117bd6ef4af029934703940d59e1c70866937b0;hpb=dc074d042a23f07350f0c2c68a2477763a5aaba0

diff --git a/ginac/utils.cpp b/ginac/utils.cpp
index 374f3bc4..7acb3a98 100644
--- 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,10 +754,10 @@ 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
@@ -798,14 +778,14 @@ 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
@@ -844,6 +824,4 @@ const ex & _ex120(void)
 // none
 
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC