Tweaks to lowlevel.[ch]xx from Norman.

diff --git a/SimGear.dsp b/SimGear.dsp
index 1e79a3ef44c13d0e35bf3eb6e68fdb8dc01891d3..612af6462e8b207c2497978945783482f928d386 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -1103,267 +1103,31 @@ SOURCE=.\simgear\sky\stars.cxx
 \r
 # End Source File\r
 # End Group\r
-# Begin Group "Lib_sgtiming"\r
+# Begin Group "Lib_sgthreads"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\timing\geocoord.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\lowleveltime.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\sg_time.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\timezone.cxx\r
+SOURCE=.\simgear\threads\SGThread.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
+# PROP Intermediate_Dir "Release\Lib_sgthreads"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\#\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\event.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\event.hxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\#\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\fg_timer.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
+# PROP Intermediate_Dir "Debug\Lib_sgthreads"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\fg_timer.hxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\#\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\light.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\light.hxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\#\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\moonpos.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\moonpos.hxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\timing\#\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgtiming"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgtiming"\r
-\r
-!ENDIF \r
+# End Group\r
+# Begin Group "Lib_sgtiming"\r
 \r
-# End Source File\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\timing\sunpos.cxx\r
+SOURCE=.\simgear\timing\geocoord.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1378,7 +1142,7 @@ SOURCE=.\simgear\timing\sunpos.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\timing\sunpos.hxx\r
+SOURCE=.\simgear\timing\lowleveltime.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1393,7 +1157,7 @@ SOURCE=.\simgear\timing\sunpos.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\timing\#\r
+SOURCE=.\simgear\timing\sg_time.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1408,7 +1172,7 @@ SOURCE=.\simgear\timing\#
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\timing\timestamp.hxx\r
+SOURCE=.\simgear\timing\timezone.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r

diff --git a/simgear/io/lowlevel.cxx b/simgear/io/lowlevel.cxx
index 638b0666a181034b5a0fc0dcce1aa84b0e610690..54ba40c365cb2b2371844801c2c6113e29f1ed89 100644 (file)
--- a/simgear/io/lowlevel.cxx
+++ b/simgear/io/lowlevel.cxx
@@ -521,29 +521,3 @@ void sgWriteString ( gzFile fd, const char *var )
 }
 
 
-void sgReadVec2  ( gzFile fd, sgVec2 var ) { sgReadFloat  ( fd, 2, var ) ; }
-void sgWriteVec2 ( gzFile fd, const sgVec2 var ) {
-    sgWriteFloat ( fd, 2, var ) ;
-}
-
-void sgReadVec3  ( gzFile fd, sgVec3 var ) { sgReadFloat  ( fd, 3, var ) ; }
-void sgWriteVec3 ( gzFile fd, const sgVec3 var ) {
-    sgWriteFloat ( fd, 3, var ) ;
-}
-
-void sgReaddVec3  ( gzFile fd, sgdVec3 var ) { sgReadDouble  ( fd, 3, var ) ; }
-void sgWritedVec3 ( gzFile fd, const sgdVec3 var ) {
-    sgWriteDouble ( fd, 3, var ) ;
-}
-
-void sgReadVec4  ( gzFile fd, sgVec4 var ) { sgReadFloat  ( fd, 4, var ) ; }
-void sgWriteVec4 ( gzFile fd, const sgVec4 var ) {
-    sgWriteFloat ( fd, 4, var ) ;
-}
-
-void sgReadMat4  ( gzFile fd, sgMat4 var ) {
-    sgReadFloat  ( fd, 16, (float *)var ) ;
-}
-void sgWriteMat4 ( gzFile fd, const sgMat4 var ) {
-    sgWriteFloat ( fd, 16, (float *)var ) ;
-}

diff --git a/simgear/io/lowlevel.hxx b/simgear/io/lowlevel.hxx
index 979f243bf12d4b17dbf4a3620744656c71ca7621..82e37928f17f33669895953452b4f16a182ce843 100644 (file)
--- a/simgear/io/lowlevel.hxx
+++ b/simgear/io/lowlevel.hxx
@@ -79,17 +79,40 @@ void sgWriteBytes ( gzFile fd, const unsigned int n, const void *var ) ;
 void sgReadString ( gzFile fd, char **var ) ;
 void sgWriteString ( gzFile fd, const char *var ) ;
 
-void sgReadVec2 ( gzFile fd, sgVec2 var ) ;
-void sgWriteVec2 ( gzFile fd, const sgVec2 var ) ;
-void sgReadVec3 ( gzFile fd, sgVec3 var ) ;
-void sgWriteVec3 ( gzFile fd, const sgVec3 var ) ;
-void sgReaddVec3 ( gzFile fd, sgdVec3 var ) ;
-void sgWritedVec3 ( gzFile fd, const sgdVec3 var ) ;
-void sgReadVec4 ( gzFile fd, sgVec4 var ) ;
-void sgWriteVec4 ( gzFile fd, const sgVec4 var ) ;
-
-void sgReadMat4 ( gzFile fd, sgMat4 var ) ;
-void sgWriteMat4 ( gzFile fd, const sgMat4 var ) ;
+inline void sgReadVec2  ( gzFile fd, sgVec2 var ) {
+    sgReadFloat  ( fd, 2, var ) ;
+}
+inline void sgWriteVec2 ( gzFile fd, const sgVec2 var ) {
+    sgWriteFloat ( fd, 2, var ) ;
+}
+
+inline void sgReadVec3  ( gzFile fd, sgVec3 var ) {
+    sgReadFloat  ( fd, 3, var ) ;
+}
+inline void sgWriteVec3 ( gzFile fd, const sgVec3 var ) {
+    sgWriteFloat ( fd, 3, var ) ;
+}
+
+inline void sgReaddVec3  ( gzFile fd, sgdVec3 var ) {
+    sgReadDouble  ( fd, 3, var ) ;
+}
+inline void sgWritedVec3 ( gzFile fd, const sgdVec3 var ) {
+    sgWriteDouble ( fd, 3, var ) ;
+}
+
+inline void sgReadVec4  ( gzFile fd, sgVec4 var ) {
+    sgReadFloat  ( fd, 4, var ) ;
+}
+inline void sgWriteVec4 ( gzFile fd, const sgVec4 var ) {
+    sgWriteFloat ( fd, 4, var ) ;
+}
+
+inline void sgReadMat4  ( gzFile fd, sgMat4 var ) {
+    sgReadFloat  ( fd, 16, (float *)var ) ;
+}
+inline void sgWriteMat4 ( gzFile fd, const sgMat4 var ) {
+    sgWriteFloat ( fd, 16, (float *)var ) ;
+}
 
 void sgClearReadError();
 void sgClearWriteError();