Melchior FRANZ:

- new FSF address
- removed a few hundred trailing spaces
- fixed a few $Id$ lines
- copied two license headers from *.hxx files to their respective
  *.cxx counterparts
- added two test aps to .cvsignore
- don't unlock an already unlocked mutex (Someone wanted to be on
  the safe side with this, but the result is undefined and makes
  pthread_mutex_destroy fail. Reference: manpage for
  pthread_mutexattr_gettype/The Open Group[1]: "Attempting to
  unlock a mutex of this type which is not locked results in
  undefined behaviour.")
- re-enabled all subsystem destructors again (this has been disabled
  because fgfs hung on exit, due to the mutex destroy failure)

diff --git a/simgear/bucket/newbucket.cxx b/simgear/bucket/newbucket.cxx
index 9a913628cbf39a777f3fab541cdff8e25c29cfe4..6a4b2ecb479ddb50d4d533d5730bb6cb7dc48391 100644 (file)
--- a/simgear/bucket/newbucket.cxx
+++ b/simgear/bucket/newbucket.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/bucket/newbucket.hxx b/simgear/bucket/newbucket.hxx
index b7ad1deb62ff4343c4182332c347499fc757fc09..2ba7de551e669d4a0da76fa0f5c901cf5265b8b4 100644 (file)
--- a/simgear/bucket/newbucket.hxx
+++ b/simgear/bucket/newbucket.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/compiler.h b/simgear/compiler.h
index ed3f9f1b95c65d699238019ec8b220485f01bc39..40bb0855ef6244ac99fc61c86acb136fa5b4e80e 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -11,10 +11,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  *

diff --git a/simgear/constants.h b/simgear/constants.h
index b77a7965f00b442ffb27ed19f2a154c4a5b23772..0ce5ab9e7866b26745ca10a832a654336f59fe0b 100644 (file)
--- a/simgear/constants.h
+++ b/simgear/constants.h
@@ -14,10 +14,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/debug/logstream.cxx b/simgear/debug/logstream.cxx
index c47d4c8b35a2d050d50ebdf94f1c972deb81b26c..255eae07a88542f5580d6f48e3ae72d5cabd49ad 100644 (file)
--- a/simgear/debug/logstream.cxx
+++ b/simgear/debug/logstream.cxx
@@ -14,10 +14,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index f81cc0b44abfe95ac4411e5b14d7bb604936d44f..98e5e3269e37ed3057aed7c6192670b71e86f9a1 100644 (file)
--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -16,10 +16,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/environment/metar.cxx b/simgear/environment/metar.cxx
index c6da78de6ebc1395b1f544510fadf3b5791014e2..d0dd28c16ecd34ab123880543c539d3d4ce8039f 100644 (file)
--- a/simgear/environment/metar.cxx
+++ b/simgear/environment/metar.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/environment/metar.hxx b/simgear/environment/metar.hxx
index a446152d6d44f23bca427cfb5e48ada440c78241..3db6f4d850e7a7630068fc71ad077e22a8303bd6 100644 (file)
--- a/simgear/environment/metar.hxx
+++ b/simgear/environment/metar.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/environment/visual_enviro.cxx b/simgear/environment/visual_enviro.cxx
index 01b9a9f1cb2b37ad24673c4119d3438cfb9fcccb..32140a561e661dc4ad06ad48db7e58689f91165d 100644 (file)
--- a/simgear/environment/visual_enviro.cxx
+++ b/simgear/environment/visual_enviro.cxx
@@ -16,10 +16,9 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //
-
 #ifdef HAVE_CONFIG_H
 #  include <simgear_config.h>
 #endif

diff --git a/simgear/environment/visual_enviro.hxx b/simgear/environment/visual_enviro.hxx
index 946c169caaa05ade89bbeb3ca3354be970f31eee..33f53c7577207db7194f7dc557820f3aa483623c 100644 (file)
--- a/simgear/environment/visual_enviro.hxx
+++ b/simgear/environment/visual_enviro.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //
 #ifndef _VISUAL_ENVIRO_HXX

diff --git a/simgear/ephemeris/celestialBody.cxx b/simgear/ephemeris/celestialBody.cxx
index 2a7f55638974f12129ff552c2c263c67b64ecede..8a1539cc120f8226e4baee94cffa9ea1b30c2350 100644 (file)
--- a/simgear/ephemeris/celestialBody.cxx
+++ b/simgear/ephemeris/celestialBody.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/celestialBody.hxx b/simgear/ephemeris/celestialBody.hxx
index 43b1d480d2017c98c631f0638086e381bc38903d..6572a45c2fc114d801af1e0f1ddf131b007c1b6f 100644 (file)
--- a/simgear/ephemeris/celestialBody.hxx
+++ b/simgear/ephemeris/celestialBody.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/
@@ -27,9 +26,9 @@
 #ifndef _CELESTIALBODY_H_
 #define _CELESTIALBODY_H_
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 
 #include <simgear/constants.h>

diff --git a/simgear/ephemeris/ephemeris.cxx b/simgear/ephemeris/ephemeris.cxx
index 31ceb01f964eb26a280b3e916293f799be0e08f1..46c7df2c973ba324173b414ae7182bec0996b2b7 100644 (file)
--- a/simgear/ephemeris/ephemeris.cxx
+++ b/simgear/ephemeris/ephemeris.cxx
@@ -15,10 +15,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/ephemeris/ephemeris.hxx b/simgear/ephemeris/ephemeris.hxx
index c00d09631a181fbce5bb9d8c54d7f8972a48d7ba..e8fd02cfb77950a02b7003a1e8d8d5febde5f090 100644 (file)
--- a/simgear/ephemeris/ephemeris.hxx
+++ b/simgear/ephemeris/ephemeris.hxx
@@ -19,10 +19,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/ephemeris/jupiter.cxx b/simgear/ephemeris/jupiter.cxx
index 79687ac7a5fe46f7d39e769d838f48cf0d666e5d..1c16e119961d2a98c1129ac3607cda8a53bf54b9 100644 (file)
--- a/simgear/ephemeris/jupiter.cxx
+++ b/simgear/ephemeris/jupiter.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/jupiter.hxx b/simgear/ephemeris/jupiter.hxx
index 04bf19c0addef1a5e693cad5b7b4196c8577b01c..e5d7e4c930f4de583137741528cc5a2c4e28224e 100644 (file)
--- a/simgear/ephemeris/jupiter.hxx
+++ b/simgear/ephemeris/jupiter.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/mars.cxx b/simgear/ephemeris/mars.cxx
index a1879ee2197562272fd2d6e8311aec1f05104ac3..57b4165d43f9ae32cfd29422ea7035102c4702ca 100644 (file)
--- a/simgear/ephemeris/mars.cxx
+++ b/simgear/ephemeris/mars.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/mars.hxx b/simgear/ephemeris/mars.hxx
index 307f3812272db229e9cafe0835d448b17e3929c9..a7201cbf49d7020679d3812b40899234276eefe2 100644 (file)
--- a/simgear/ephemeris/mars.hxx
+++ b/simgear/ephemeris/mars.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/mercury.cxx b/simgear/ephemeris/mercury.cxx
index 7ed8b1f53b533bd3d0ba1b5b709e587fde452f03..6651ed679a62113f5ca2a1cb45a522efd6ac7a9a 100644 (file)
--- a/simgear/ephemeris/mercury.cxx
+++ b/simgear/ephemeris/mercury.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/mercury.hxx b/simgear/ephemeris/mercury.hxx
index aecf8dc13cace921bcc4f17e6679697a43312766..649e4e418b5ee70f3400d78c766245639223bd6b 100644 (file)
--- a/simgear/ephemeris/mercury.hxx
+++ b/simgear/ephemeris/mercury.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/moonpos.cxx b/simgear/ephemeris/moonpos.cxx
index 9ff25518ccb44fbd5182010a331089998d57e288..4f8ca09f9c658a84de27f1849c1b9e5ebf21a9de 100644 (file)
--- a/simgear/ephemeris/moonpos.cxx
+++ b/simgear/ephemeris/moonpos.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/moonpos.hxx b/simgear/ephemeris/moonpos.hxx
index 96092b9f2621faf5f58f372a5b4790380bc299a1..6163249c89372a6664340540a15d56b84ddd2052 100644 (file)
--- a/simgear/ephemeris/moonpos.hxx
+++ b/simgear/ephemeris/moonpos.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/neptune.cxx b/simgear/ephemeris/neptune.cxx
index e74744bf624e72c1f731ce4f0ed5966d24932e08..2fbe75984e4340e3f4319bb720d1cb2cb7c92ccf 100644 (file)
--- a/simgear/ephemeris/neptune.cxx
+++ b/simgear/ephemeris/neptune.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/neptune.hxx b/simgear/ephemeris/neptune.hxx
index 81f75ff5601474d5c297b9cbc13e963433fcc56e..0bbccef913e44ded386c3ddc8797fb69d43dc14e 100644 (file)
--- a/simgear/ephemeris/neptune.hxx
+++ b/simgear/ephemeris/neptune.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/pluto.hxx b/simgear/ephemeris/pluto.hxx
index 54b4246d6b04c555642be116abd460ecd95b0ab5..072e87f8d70de51a62996256860e71f6a12f4a9b 100644 (file)
--- a/simgear/ephemeris/pluto.hxx
+++ b/simgear/ephemeris/pluto.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/saturn.cxx b/simgear/ephemeris/saturn.cxx
index fcb12a1ffae75240577e6e179bbbe3b0e85df5af..eed07711f27522805b4556d59b97a1d433f96118 100644 (file)
--- a/simgear/ephemeris/saturn.cxx
+++ b/simgear/ephemeris/saturn.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/saturn.hxx b/simgear/ephemeris/saturn.hxx
index c1731ade0d3237bd99aa0d1f5b3268366543b705..79a9ae408154780337c1b1411a6b1815ab219fa8 100644 (file)
--- a/simgear/ephemeris/saturn.hxx
+++ b/simgear/ephemeris/saturn.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/star.cxx b/simgear/ephemeris/star.cxx
index 86450380f629c08186ec225ffbfc5531d3a9652b..0bf3451d3d03fc8fd139bb5922114b56cf797165 100644 (file)
--- a/simgear/ephemeris/star.cxx
+++ b/simgear/ephemeris/star.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/star.hxx b/simgear/ephemeris/star.hxx
index 81419e79f7663e1e25452791da5b2c4ac0b342a4..781cfcd602beda0760bba89b412ee7f1a1b294f1 100644 (file)
--- a/simgear/ephemeris/star.hxx
+++ b/simgear/ephemeris/star.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/stardata.cxx b/simgear/ephemeris/stardata.cxx
index 86583ea4e48c79faa87a049051167b201d19b515..4c703cf9cf1eb593a29ef8dee108300ce36106fe 100644 (file)
--- a/simgear/ephemeris/stardata.cxx
+++ b/simgear/ephemeris/stardata.cxx
@@ -14,10 +14,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/ephemeris/stardata.hxx b/simgear/ephemeris/stardata.hxx
index 7f675b45f61658e56f99960f337fd2e407cbe2df..7f2078886fc59fe5804e5deaa7d4d6ffd1582f8a 100644 (file)
--- a/simgear/ephemeris/stardata.hxx
+++ b/simgear/ephemeris/stardata.hxx
@@ -14,10 +14,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/ephemeris/uranus.cxx b/simgear/ephemeris/uranus.cxx
index 7062c3c785a3f272bc53f86117e0e5711ec7103d..a3e9162c336bd7bdd010d8cc69defd81a4de7a6e 100644 (file)
--- a/simgear/ephemeris/uranus.cxx
+++ b/simgear/ephemeris/uranus.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/uranus.hxx b/simgear/ephemeris/uranus.hxx
index 5932822b4ba7ed10edb99a4ce74a179167a92f0b..4a760b58ee2d393b4fe10803175dfbd707acf345 100644 (file)
--- a/simgear/ephemeris/uranus.hxx
+++ b/simgear/ephemeris/uranus.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/venus.cxx b/simgear/ephemeris/venus.cxx
index 10e498cc786773882ded19ac7ce10fa856256103..0e37bbf20cd6385273bb865e5caf90418c23eb69 100644 (file)
--- a/simgear/ephemeris/venus.cxx
+++ b/simgear/ephemeris/venus.cxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/ephemeris/venus.hxx b/simgear/ephemeris/venus.hxx
index 4f48d0a8e20ab004aa4361342c626d1566878f2d..4b415e5f62d4bbde556eda2eaa7990d2b8108718 100644 (file)
--- a/simgear/ephemeris/venus.hxx
+++ b/simgear/ephemeris/venus.hxx
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Id$
  **************************************************************************/

diff --git a/simgear/io/iochannel.cxx b/simgear/io/iochannel.cxx
index 994aa89f4e6d3c2d56ac39851c9440bbd9ac8a49..9b88c6d5f183fa021963e67e087d897b2f9ba25f 100644 (file)
--- a/simgear/io/iochannel.cxx
+++ b/simgear/io/iochannel.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/iochannel.hxx b/simgear/io/iochannel.hxx
index 48c782a1e045b05d91b66c94f9b79db403c697be..a0392a34bb17e758fd67464976173b08ab1e57e9 100644 (file)
--- a/simgear/io/iochannel.hxx
+++ b/simgear/io/iochannel.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/lowlevel.cxx b/simgear/io/lowlevel.cxx
index fd90c717b3963047625d0148df94b76ee720fc47..19909b7d5e9d2d2f07f329e846f54e30427728ba 100644 (file)
--- a/simgear/io/lowlevel.cxx
+++ b/simgear/io/lowlevel.cxx
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/lowlevel.hxx b/simgear/io/lowlevel.hxx
index a8af66ae5c7c96c28c562b1eab7d5ab0487fd43c..0f650d5b0f27d0372b0395895c484cb9e3da05e2 100644 (file)
--- a/simgear/io/lowlevel.hxx
+++ b/simgear/io/lowlevel.hxx
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 //

diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx
index ffe58a0b8c7bf4177014c6c929005584c276f010..ba4cfc60a60f17baf9bef31d8b6ae21f4e08f9b7 100644 (file)
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 //

diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx
index ae3ccad504300fd44b4f56edf3fbadc93aa25449..542a333a973882435026b21aa385a65620515289 100644 (file)
--- a/simgear/io/sg_binobj.hxx
+++ b/simgear/io/sg_binobj.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/sg_file.cxx b/simgear/io/sg_file.cxx
index dace6454060c5e7bad2b100587f0ef2e6e3f84ab..0505cac46679a24403536829481de70a735154df 100644 (file)
--- a/simgear/io/sg_file.cxx
+++ b/simgear/io/sg_file.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/sg_file.hxx b/simgear/io/sg_file.hxx
index ab3f7be0d061f2c134c6fbebcb3d3a1f11aefaab..9f91af347b9b75dc89df65e373a6d3e9b5964719 100644 (file)
--- a/simgear/io/sg_file.hxx
+++ b/simgear/io/sg_file.hxx
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/sg_serial.cxx b/simgear/io/sg_serial.cxx
index f6eb07c0fd30153a6ae872011b766cc1ad5ac425..c9b8865f76a7d83cbc2983242cae4b83780537c1 100644 (file)
--- a/simgear/io/sg_serial.cxx
+++ b/simgear/io/sg_serial.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx
index bb51ce33afb0bdd07579c6f04048c4bd4ae39711..b7c8553d0dd86ce38d782e9dc2a45bcecc761ca9 100644 (file)
--- a/simgear/io/sg_serial.hxx
+++ b/simgear/io/sg_serial.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/sg_socket.cxx b/simgear/io/sg_socket.cxx
index b45b551b761629948f73753ca9476746b6bcedc7..433415dcfe1b42d98d8fd9aaf52bbede9124863e 100644 (file)
--- a/simgear/io/sg_socket.cxx
+++ b/simgear/io/sg_socket.cxx
@@ -17,7 +17,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/sg_socket.hxx b/simgear/io/sg_socket.hxx
index b1965c512fcef9541aeb7c199bc1d7710f7935c5..f54e090dcd6150593d22473aca21fdcd7849449c 100644 (file)
--- a/simgear/io/sg_socket.hxx
+++ b/simgear/io/sg_socket.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/sg_socket_udp.cxx b/simgear/io/sg_socket_udp.cxx
index 7c0a0d600ca70932cdd1b5e1e9906174aea97192..97f0d8e00875cc1d5b60fca12d32596b1935758a 100644 (file)
--- a/simgear/io/sg_socket_udp.cxx
+++ b/simgear/io/sg_socket_udp.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/io/sg_socket_udp.hxx b/simgear/io/sg_socket_udp.hxx
index 89d4f2d7259b60578953b8435d3115796d19cab2..731909afe6638fe585f674931bcb4f9b648fe5a1 100644 (file)
--- a/simgear/io/sg_socket_udp.hxx
+++ b/simgear/io/sg_socket_udp.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/magvar/coremag.cxx b/simgear/magvar/coremag.cxx
index cccf753a33bfd2f35774357e2a9cd88776f104e8..660f730eca05e96e82622b383b6de4257fdd1fb8 100644 (file)
--- a/simgear/magvar/coremag.cxx
+++ b/simgear/magvar/coremag.cxx
@@ -57,10 +57,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/magvar/coremag.hxx b/simgear/magvar/coremag.hxx
index 3c567fa00494f43484b570f2d0a6cc7d91c32e40..42eeacae020ef72765ba929f20ba52c940fe1466 100644 (file)
--- a/simgear/magvar/coremag.hxx
+++ b/simgear/magvar/coremag.hxx
@@ -26,10 +26,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/magvar/magvar.cxx b/simgear/magvar/magvar.cxx
index 0e030d020b41f6b5182e113918b88c2418e8f9fa..11f59b8b468a62c2e6c902b11332aeb09bac37b3 100644 (file)
--- a/simgear/magvar/magvar.cxx
+++ b/simgear/magvar/magvar.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/magvar/magvar.hxx b/simgear/magvar/magvar.hxx
index c72c8e601dc9f644e842f40db13e655b0f5d0aa6..c2e80bc4a5194b17480ddf624b03292d3abeb674 100644 (file)
--- a/simgear/magvar/magvar.hxx
+++ b/simgear/magvar/magvar.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -28,9 +28,9 @@
 #define _MAGVAR_HXX
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 
 /**

diff --git a/simgear/math/.cvsignore b/simgear/math/.cvsignore
index e9955884756af11fe171e89bf99e459ac44f1a2a..b0595f2940bec3e217c200c26493214593f309f9 100644 (file)
--- a/simgear/math/.cvsignore
+++ b/simgear/math/.cvsignore
@@ -1,3 +1,4 @@
 .deps
 Makefile
 Makefile.in
+SGMathTest

diff --git a/simgear/math/SGGeoc.hxx b/simgear/math/SGGeoc.hxx
index 6810be309e310459eb6e7e271ca439a05b37faa5..5b4f24cd7ab0954661fe63986f764e54abbf987a 100644 (file)
--- a/simgear/math/SGGeoc.hxx
+++ b/simgear/math/SGGeoc.hxx
@@ -28,10 +28,9 @@ class SGGeoc {
 public:
   /// Default constructor, initializes the instance to lat = lon = lat = 0
   SGGeoc(void);
-  /// Initialize from a cartesian vector assumed to be in meters
-  /// Note that this conversion is relatively expensive to compute
-  SGGeoc(const SGVec3<double>& cart);
-  /// Initialize from a geodetic position
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   /// Note that this conversion is relatively expensive to compute
   SGGeoc(const SGGeod& geod);
 

diff --git a/simgear/math/SGGeod.hxx b/simgear/math/SGGeod.hxx
index a796861d51c4497aa9fff536b9677dae7cb0cabd..0a913257b2194fe88ee43a7c53509047ac8a7af4 100644 (file)
--- a/simgear/math/SGGeod.hxx
+++ b/simgear/math/SGGeod.hxx
@@ -28,10 +28,9 @@ class SGGeod {
 public:
   /// Default constructor, initializes the instance to lat = lon = elev = 0
   SGGeod(void);
-  /// Initialize from a cartesian vector assumed to be in meters
-  /// Note that this conversion is relatively expensive to compute
-  SGGeod(const SGVec3<double>& cart);
-  /// Initialize from a geocentric position
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   /// Note that this conversion is relatively expensive to compute
   SGGeod(const SGGeoc& geoc);
 

diff --git a/simgear/math/SGGeodesy.cxx b/simgear/math/SGGeodesy.cxx
index 16b9e7ae10ee709908bda596f026ed120171a042..079c368b547411d2c39f5d79dad6d495e49c5b61 100644 (file)
--- a/simgear/math/SGGeodesy.cxx
+++ b/simgear/math/SGGeodesy.cxx
@@ -27,10 +27,9 @@
 // These are hard numbers from the WGS84 standard.  DON'T MODIFY
 // unless you want to change the datum.
 #define _EQURAD 6378137.0
-#define _FLATTENING 298.257223563
-
-// These are derived quantities more useful to the code:
-#if 0
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define _SQUASH (1 - 1/_FLATTENING)
 #define _STRETCH (1/_SQUASH)
 #define _POLRAD (EQURAD * _SQUASH)

diff --git a/simgear/math/SGGeodesy.hxx b/simgear/math/SGGeodesy.hxx
index deb16ae1dc1cd6c3242ac7407daed7e79d0ddac4..476879fe7c0f594dbb4742b665ed18e79cf63a24 100644 (file)
--- a/simgear/math/SGGeodesy.hxx
+++ b/simgear/math/SGGeodesy.hxx
@@ -28,10 +28,9 @@ class SGVec3;
 class SGGeodesy {
 public:
   // Hard numbers from the WGS84 standard.
-  static const double EQURAD;
-  static const double iFLATTENING;
-  static const double SQUASH;
-  static const double STRETCH;
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   static const double POLRAD;
 
   /// Takes a cartesian coordinate data and returns the geodetic

diff --git a/simgear/sg_inlines.h b/simgear/sg_inlines.h
index 8e4585d479876f8d39db37146deb9a7f535a9df1..5d47d594c8994ae629213d39822b7fddd58f6115 100644 (file)
--- a/simgear/sg_inlines.h
+++ b/simgear/sg_inlines.h
@@ -17,10 +17,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 

diff --git a/simgear/structure/subsystem_mgr.cxx b/simgear/structure/subsystem_mgr.cxx
index 9ae7d7065c02ed5d19ee47c23e7867964116fda4..3be9096233ac67f9258c19a9e5b594e2c7398c8b 100644 (file)
--- a/simgear/structure/subsystem_mgr.cxx
+++ b/simgear/structure/subsystem_mgr.cxx
@@ -224,8 +224,7 @@ SGSubsystemGroup::Member::Member (const Member &)
 
 SGSubsystemGroup::Member::~Member ()
 {
-                                // FIXME: causes a crash
-//     delete subsystem;
+    delete subsystem;
 }
 
 void

diff --git a/simgear/threads/SGQueue.hxx b/simgear/threads/SGQueue.hxx
index 532106bf3bdd74e429da907f670d9f8c4f64adda..9f534ec909a34e53b01e99c0e8f42b85fcaa0989 100644 (file)
--- a/simgear/threads/SGQueue.hxx
+++ b/simgear/threads/SGQueue.hxx
@@ -183,7 +183,7 @@ public:
     /**
      * Destroy this queue.
      */
-    ~SGBlockingQueue() { mutex.unlock(); }
+    ~SGBlockingQueue() {}
 
     /**
      *