Merge branch 'main' of gitlab.jyu.fi:patavirt/usadelndsoc into main

src/common.hpp

@@ -46,31 +46,28 @@ namespace Eigen
     template<typename BinaryOp> struct ScalarBinaryOpTraits<double,ADComplex,BinaryOp> { typedef ADComplex ReturnType;  };
     template<typename BinaryOp> struct ScalarBinaryOpTraits<ADComplex,Complex,BinaryOp> { typedef ADComplex ReturnType;  };
     template<typename BinaryOp> struct ScalarBinaryOpTraits<Complex,ADComplex,BinaryOp> { typedef ADComplex ReturnType;  };
-
-    namespace usadelndsoc {
-        ADComplex operator*(const ADComplex& a, const double& b) { return a * adcomplex(b); }
-        ADComplex operator*(const double& a, const ADComplex& b) { return adcomplex(a) * b; }
-        ADComplex operator*(const ADComplex& a, const Complex& b) { return a * adcomplex(b); }
-        ADComplex operator*(const Complex& a, const ADComplex& b) { return adcomplex(a) * b; }
-
-        ADComplex operator+(const ADComplex& a, const double& b) { return a + adcomplex(b); }
-        ADComplex operator+(const double& a, const ADComplex& b) { return adcomplex(a) + b; }
-        ADComplex operator+(const ADComplex& a, const Complex& b) { return a + adcomplex(b); }
-        ADComplex operator+(const Complex& a, const ADComplex& b) { return adcomplex(a) + b; }
-
-        ADComplex operator-(const ADComplex& a, const double& b) { return a - adcomplex(b); }
-        ADComplex operator-(const double& a, const ADComplex& b) { return adcomplex(a) - b; }
-        ADComplex operator-(const ADComplex& a, const Complex& b) { return a - adcomplex(b); }
-        ADComplex operator-(const Complex& a, const ADComplex& b) { return adcomplex(a) - b; }
-
-        ADComplex operator/(const ADComplex& a, const double& b) { return a / adcomplex(b); }
-        ADComplex operator/(const double& a, const ADComplex& b) { return adcomplex(a) / b; }
-        ADComplex operator/(const ADComplex& a, const Complex& b) { return a / adcomplex(b); }
-        ADComplex operator/(const Complex& a, const ADComplex& b) { return adcomplex(a) / b; }
-    }
-    using namespace usadelndsoc;
 }
 
-using namespace Eigen::usadelndsoc;
+namespace CppAD {
+    ADComplex operator*(const ADComplex& a, const double& b) { return a * adcomplex(b); }
+    ADComplex operator*(const double& a, const ADComplex& b) { return adcomplex(a) * b; }
+    ADComplex operator*(const ADComplex& a, const Complex& b) { return a * adcomplex(b); }
+    ADComplex operator*(const Complex& a, const ADComplex& b) { return adcomplex(a) * b; }
+
+    ADComplex operator+(const ADComplex& a, const double& b) { return a + adcomplex(b); }
+    ADComplex operator+(const double& a, const ADComplex& b) { return adcomplex(a) + b; }
+    ADComplex operator+(const ADComplex& a, const Complex& b) { return a + adcomplex(b); }
+    ADComplex operator+(const Complex& a, const ADComplex& b) { return adcomplex(a) + b; }
+
+    ADComplex operator-(const ADComplex& a, const double& b) { return a - adcomplex(b); }
+    ADComplex operator-(const double& a, const ADComplex& b) { return adcomplex(a) - b; }
+    ADComplex operator-(const ADComplex& a, const Complex& b) { return a - adcomplex(b); }
+    ADComplex operator-(const Complex& a, const ADComplex& b) { return adcomplex(a) - b; }
+
+    ADComplex operator/(const ADComplex& a, const double& b) { return a / adcomplex(b); }
+    ADComplex operator/(const double& a, const ADComplex& b) { return adcomplex(a) / b; }
+    ADComplex operator/(const ADComplex& a, const Complex& b) { return a / adcomplex(b); }
+    ADComplex operator/(const Complex& a, const ADComplex& b) { return adcomplex(a) / b; }
+}
 
 #endif