Changeset 220 in pacpusframework for trunk/include

Timestamp:

Nov 13, 2013, 10:15:27 AM (11 years ago)

Author:

Marek Kurdej

Message:

Update: using directive.

File:

• trunk/include/Pacpus/PacpusTools/geodesie.h (modified) (4 diffs)

trunk/include/Pacpus/PacpusTools/geodesie.h

@@ -190 +190 @@
 void cartesianToPolar(const _T1 x, const _T1 y, _T2& r, _T2& theta)
 {
-    r = std::sqrt(x * x + y * y);
-    theta = std::atan2(x, y);
+    using ::std::atan2;
+    using ::std::sqrt;
+
+    r = sqrt(x * x + y * y);
+    theta = atan2(x, y);
 }
 
@@ -198 +201 @@
 void polarToCartesian(const _T1 r, const _T1 theta, _T2& x, _T2& y)
 {
-    x = r * std::cos(theta);
-    y = r * std::sin(theta);
+    using ::std::cos;
+    using ::std::sin;
+
+    x = r * cos(theta);
+    y = r * sin(theta);
 }
 
@@ -207 +213 @@
 void cartesianToSpherical(const _T1 x, const _T1 y, const _T1 z, _T2& r, _T2& theta, _T2& phi)
 {
-    r = std::sqrt(x * x + y * y + z * z);
-    theta = std::acos(z / r);
-    phi = std::atan2(y, x);
+    using ::std::acos;
+    using ::std::atan2;
+    using ::std::sqrt;
+
+    r = sqrt(x * x + y * y + z * z);
+    theta = acos(z / r);
+    phi = atan2(y, x);
 }
 
@@ -217 +227 @@
 void sphericalToCartesian(const _T1 r, const _T1 theta, const _T1 phi, _T2& x, _T2& y, _T2& z)
 {
-    x = r * std::sin(theta) * std::cos(phi);
-    y = r * std::sin(theta) * std::sin(phi);
-    z = r * std::cos(theta);
+    using ::std::cos;
+    using ::std::sin;
+
+    x = r * sin(theta) * cos(phi);
+    y = r * sin(theta) * sin(phi);
+    z = r * cos(theta);
 }