[Toon-members] TooN se2.h se3.h so2.h so3.h wls.h

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/04/14 12:42:37

Modified files:
        .              : se2.h se3.h so2.h so3.h wls.h 

Log message:
        Removed TOON 1.x -> TOON historic compatibility
        
        Renamed include guards

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/se2.h?cvsroot=toon&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/TooN/se3.h?cvsroot=toon&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/TooN/so2.h?cvsroot=toon&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/TooN/so3.h?cvsroot=toon&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/TooN/wls.h?cvsroot=toon&r1=1.12&r2=1.13

Patches:
Index: se2.h
===================================================================
RCS file: /cvsroot/toon/TooN/se2.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- se2.h       10 Apr 2009 05:51:47 -0000      1.4
+++ se2.h       14 Apr 2009 12:42:35 -0000      1.5
@@ -30,14 +30,13 @@
 
 /* This code mostly made by copying from se3.h !! */
 
-#ifndef __SE2_H
-#define __SE2_H
+#ifndef TOON_INCLUDE_SE2_H
+#define TOON_INCLUDE_SE2_H
 
 #include <TooN/so2.h>
 
-#ifndef TOON_NO_NAMESPACE
+
 namespace TooN {
-#endif
 
 template <typename Precision = double>
 class SE2 {
@@ -327,8 +326,5 @@
        return SE2<Precision>( lhs*rhs.get_rotation(), 
lhs*rhs.get_translation());
 }
 
-#ifndef TOON_NO_NAMESPACE
 }
 #endif
-
-#endif

Index: se3.h
===================================================================
RCS file: /cvsroot/toon/TooN/se3.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- se3.h       10 Apr 2009 06:13:48 -0000      1.20
+++ se3.h       14 Apr 2009 12:42:36 -0000      1.21
@@ -27,14 +27,12 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef __SE3_H
-#define __SE3_H
+#ifndef TOON_INCLUDE_SE3_H
+#define TOON_INCLUDE_SE3_H
 
 #include <TooN/so3.h>
 
-#ifndef TOON_NO_NAMESPACE
 namespace TooN {
-#endif
 
 template <typename Precision = double>
 class SE3 {
@@ -554,8 +552,6 @@
 
 #endif
 
-#ifndef TOON_NO_NAMESPACE
 }
-#endif
 
 #endif

Index: so2.h
===================================================================
RCS file: /cvsroot/toon/TooN/so2.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- so2.h       10 Apr 2009 06:16:36 -0000      1.8
+++ so2.h       14 Apr 2009 12:42:36 -0000      1.9
@@ -28,15 +28,13 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef __SO2_H
-#define __SO2_H
+#ifndef TOON_INCLUDE_SO2_H
+#define TOON_INCLUDE_SO2_H
 
 #include <TooN/TooN.h>
 #include <TooN/helpers.h>
 
-#ifndef TOON_NO_NAMESPACE
 namespace TooN {
-#endif
 
 template<typename Precision> class SO2;
 template <typename Precision> class SE2;
@@ -136,8 +134,6 @@
        return lhs * rhs.get_matrix();
 }
 
-#ifndef TOON_NO_NAMESPACE
 }
-#endif
 
 #endif

Index: so3.h
===================================================================
RCS file: /cvsroot/toon/TooN/so3.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- so3.h       10 Apr 2009 06:18:02 -0000      1.30
+++ so3.h       14 Apr 2009 12:42:36 -0000      1.31
@@ -27,15 +27,13 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef __SO3_H
-#define __SO3_H
+#ifndef TOON_INCLUDE_SO3_H
+#define TOON_INCLUDE_SO3_H
 
 #include <TooN/TooN.h>
 #include <TooN/helpers.h>
 
-#ifndef TOON_NO_NAMESPACE
 namespace TooN {
-#endif
 
 template <typename Precision> class SO3;
 template <typename Precision> class SE3;
@@ -311,8 +309,6 @@
 
 #endif
 
-#ifndef TOON_NO_NAMESPACE
 }
-#endif
 
 #endif

Index: wls.h
===================================================================
RCS file: /cvsroot/toon/TooN/wls.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- wls.h       10 Apr 2009 07:57:14 -0000      1.12
+++ wls.h       14 Apr 2009 12:42:37 -0000      1.13
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef __WLS_H
-#define __WLS_H
+#ifndef TOON_INCLUDE_WLS_H
+#define TOON_INCLUDE_WLS_H
 
 #include <TooN/TooN.h>
 #include <TooN/Cholesky.h>
@@ -36,9 +36,7 @@
 
 #include <cmath>
 
-#ifndef TOON_NO_NAMESPACE
 namespace TooN {
-#endif
 
 /// Performs weighted least squares computation.
 /// @param Size The number of dimensions in the system
@@ -157,8 +155,6 @@
        int operator = ( WLS& copyof );
 };
 
-#ifndef TOON_NO_NAMESPACE
 }
-#endif
 
 #endif