Fixed syntax problem with namespace

miscmaths.cc

@@ -222,6 +222,8 @@ namespace MISCMATHS {
     // read matrix dimensions (num rows x num cols)
     unsigned int ival,nx,ny;
     fs.read((char*)&ival,sizeof(ival));
+    // ignore the padding (reserved for future use)
+    fs.read((char*)&ival,sizeof(ival));
     if (swapbytes) Swap_Nbytes(1,sizeof(ival),&ival);
     nx = ival;
     fs.read((char*)&ival,sizeof(ival));
@@ -338,6 +340,8 @@ namespace MISCMATHS {
 
     ival = BINFLAG;
     fs.write((char*)&ival,sizeof(ival));
+    ival = 0;  // padding (reserved for future use)
+    fs.write((char*)&ival,sizeof(ival));
     ival = mat.Nrows();
     fs.write((char*)&ival,sizeof(ival));
     ival = mat.Ncols();
@@ -1983,18 +1987,16 @@ vector<float> ColumnVector2vector(const ColumnVector& col)
   return vec;
 }
 
-
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
+// Uninteresting byte swapping functions
 
-typedef struct { unsigned char a,b ; } twobytes ;
+typedef struct { unsigned char a,b ; } TWObytes ;
 
 void Swap_2bytes( int n , void *ar )    /* 2 bytes at a time */
 {
    register int ii ;
-   register twobytes *tb = (twobytes *)ar ;
+   register TWObytes *tb = (TWObytes *)ar ;
    register unsigned char tt ;
 
    for( ii=0 ; ii < n ; ii++ ){
@@ -2005,12 +2007,12 @@ void Swap_2bytes( int n , void *ar )    /* 2 bytes at a time */
 
 /*---------------------------------------------------------------------------*/
 
-typedef struct { unsigned char a,b,c,d ; } fourbytes ;
+typedef struct { unsigned char a,b,c,d ; } FOURbytes ;
 
 void Swap_4bytes( int n , void *ar )    /* 4 bytes at a time */
 {
    register int ii ;
-   register fourbytes *tb = (fourbytes *)ar ;
+   register FOURbytes *tb = (FOURbytes *)ar ;
    register unsigned char tt ;
 
    for( ii=0 ; ii < n ; ii++ ){
@@ -2022,12 +2024,12 @@ void Swap_4bytes( int n , void *ar )    /* 4 bytes at a time */
 
 /*---------------------------------------------------------------------------*/
 
-typedef struct { unsigned char a,b,c,d , D,C,B,A ; } eightbytes ;
+typedef struct { unsigned char a,b,c,d , D,C,B,A ; } EIGHTbytes ;
 
 void Swap_8bytes( int n , void *ar )    /* 8 bytes at a time */
 {
    register int ii ;
-   register eightbytes *tb = (eightbytes *)ar ;
+   register EIGHTbytes *tb = (EIGHTbytes *)ar ;
    register unsigned char tt ;
 
    for( ii=0 ; ii < n ; ii++ ){
@@ -2042,12 +2044,12 @@ void Swap_8bytes( int n , void *ar )    /* 8 bytes at a time */
 /*---------------------------------------------------------------------------*/
 
 typedef struct { unsigned char a,b,c,d,e,f,g,h ,
-                               H,G,F,E,D,C,B,A  ; } sixteenbytes ;
+                               H,G,F,E,D,C,B,A  ; } SIXTEENbytes ;
 
 void Swap_16bytes( int n , void *ar )    /* 16 bytes at a time */
 {
    register int ii ;
-   register sixteenbytes *tb = (sixteenbytes *)ar ;
+   register SIXTEENbytes *tb = (SIXTEENbytes *)ar ;
    register unsigned char tt ;
 
    for( ii=0 ; ii < n ; ii++ ){
@@ -2076,3 +2078,6 @@ void Swap_Nbytes( int n , int siz , void *ar )  /* subsuming case */
    }
    return ;
 }
+
+// end namespace MISCMATHS
+}