From 4e7fe460a5c5c1b64dd1d540bc197dbb89614b7f Mon Sep 17 00:00:00 2001 From: ehofman Date: Tue, 21 Feb 2006 09:40:12 +0000 Subject: [PATCH] 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) --- simgear/bucket/newbucket.cxx | 7 +++---- simgear/bucket/newbucket.hxx | 7 +++---- simgear/compiler.h | 7 +++---- simgear/constants.h | 7 +++---- simgear/debug/logstream.cxx | 7 +++---- simgear/debug/logstream.hxx | 7 +++---- simgear/environment/metar.cxx | 2 +- simgear/environment/metar.hxx | 2 +- simgear/environment/visual_enviro.cxx | 3 +-- simgear/environment/visual_enviro.hxx | 2 +- simgear/ephemeris/celestialBody.cxx | 7 +++---- simgear/ephemeris/celestialBody.hxx | 11 +++++------ simgear/ephemeris/ephemeris.cxx | 7 +++---- simgear/ephemeris/ephemeris.hxx | 7 +++---- simgear/ephemeris/jupiter.cxx | 7 +++---- simgear/ephemeris/jupiter.hxx | 7 +++---- simgear/ephemeris/mars.cxx | 7 +++---- simgear/ephemeris/mars.hxx | 7 +++---- simgear/ephemeris/mercury.cxx | 7 +++---- simgear/ephemeris/mercury.hxx | 7 +++---- simgear/ephemeris/moonpos.cxx | 7 +++---- simgear/ephemeris/moonpos.hxx | 7 +++---- simgear/ephemeris/neptune.cxx | 7 +++---- simgear/ephemeris/neptune.hxx | 7 +++---- simgear/ephemeris/pluto.hxx | 7 +++---- simgear/ephemeris/saturn.cxx | 7 +++---- simgear/ephemeris/saturn.hxx | 7 +++---- simgear/ephemeris/star.cxx | 7 +++---- simgear/ephemeris/star.hxx | 7 +++---- simgear/ephemeris/stardata.cxx | 7 +++---- simgear/ephemeris/stardata.hxx | 7 +++---- simgear/ephemeris/uranus.cxx | 7 +++---- simgear/ephemeris/uranus.hxx | 7 +++---- simgear/ephemeris/venus.cxx | 7 +++---- simgear/ephemeris/venus.hxx | 7 +++---- simgear/io/iochannel.cxx | 2 +- simgear/io/iochannel.hxx | 2 +- simgear/io/lowlevel.cxx | 2 +- simgear/io/lowlevel.hxx | 2 +- simgear/io/sg_binobj.cxx | 2 +- simgear/io/sg_binobj.hxx | 2 +- simgear/io/sg_file.cxx | 2 +- simgear/io/sg_file.hxx | 2 +- simgear/io/sg_serial.cxx | 2 +- simgear/io/sg_serial.hxx | 2 +- simgear/io/sg_socket.cxx | 2 +- simgear/io/sg_socket.hxx | 2 +- simgear/io/sg_socket_udp.cxx | 2 +- simgear/io/sg_socket_udp.hxx | 2 +- simgear/magvar/coremag.cxx | 7 +++---- simgear/magvar/coremag.hxx | 7 +++---- simgear/magvar/magvar.cxx | 2 +- simgear/magvar/magvar.hxx | 6 +++--- simgear/math/.cvsignore | 1 + simgear/math/SGGeoc.hxx | 7 +++---- simgear/math/SGGeod.hxx | 7 +++---- simgear/math/SGGeodesy.cxx | 7 +++---- simgear/math/SGGeodesy.hxx | 7 +++---- simgear/sg_inlines.h | 7 +++---- simgear/structure/subsystem_mgr.cxx | 3 +-- simgear/threads/SGQueue.hxx | 2 +- 61 files changed, 141 insertions(+), 180 deletions(-) diff --git a/simgear/bucket/newbucket.cxx b/simgear/bucket/newbucket.cxx index 9a913628..6a4b2ecb 100644 --- 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 b7ad1deb..2ba7de55 100644 --- 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 ed3f9f1b..40bb0855 100644 --- 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 b77a7965..0ce5ab9e 100644 --- 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 c47d4c8b..255eae07 100644 --- 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 f81cc0b4..98e5e326 100644 --- 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 c6da78de..d0dd28c1 100644 --- 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 a446152d..3db6f4d8 100644 --- 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 01b9a9f1..32140a56 100644 --- 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 #endif diff --git a/simgear/environment/visual_enviro.hxx b/simgear/environment/visual_enviro.hxx index 946c169c..33f53c75 100644 --- 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 2a7f5563..8a1539cc 100644 --- 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 43b1d480..6572a45c 100644 --- 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 diff --git a/simgear/ephemeris/ephemeris.cxx b/simgear/ephemeris/ephemeris.cxx index 31ceb01f..46c7df2c 100644 --- 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 c00d0963..e8fd02cf 100644 --- 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 79687ac7..1c16e119 100644 --- 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 04bf19c0..e5d7e4c9 100644 --- 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 a1879ee2..57b4165d 100644 --- 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 307f3812..a7201cbf 100644 --- 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 7ed8b1f5..6651ed67 100644 --- 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 aecf8dc1..649e4e41 100644 --- 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 9ff25518..4f8ca09f 100644 --- 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 96092b9f..6163249c 100644 --- 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 e74744bf..2fbe7598 100644 --- 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 81f75ff5..0bbccef9 100644 --- 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 54b4246d..072e87f8 100644 --- 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 fcb12a1f..eed07711 100644 --- 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 c1731ade..79a9ae40 100644 --- 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 86450380..0bf3451d 100644 --- 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 81419e79..781cfcd6 100644 --- 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 86583ea4..4c703cf9 100644 --- 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 7f675b45..7f207888 100644 --- 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 7062c3c7..a3e9162c 100644 --- 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 5932822b..4a760b58 100644 --- 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 10e498cc..0e37bbf2 100644 --- 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 4f48d0a8..4b415e5f 100644 --- 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 994aa89f..9b88c6d5 100644 --- 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 48c782a1..a0392a34 100644 --- 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 fd90c717..19909b7d 100644 --- 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 a8af66ae..0f650d5b 100644 --- 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 ffe58a0b..ba4cfc60 100644 --- 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 ae3ccad5..542a333a 100644 --- 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 dace6454..0505cac4 100644 --- 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 ab3f7be0..9f91af34 100644 --- 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 f6eb07c0..c9b8865f 100644 --- 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 bb51ce33..b7c8553d 100644 --- 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 b45b551b..433415dc 100644 --- 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 b1965c51..f54e090d 100644 --- 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 7c0a0d60..97f0d8e0 100644 --- 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 89d4f2d7..731909af 100644 --- 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 cccf753a..660f730e 100644 --- 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 3c567fa0..42eeacae 100644 --- 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 0e030d02..11f59b8b 100644 --- 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 c72c8e60..c2e80bc4 100644 --- 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 e9955884..b0595f29 100644 --- 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 6810be30..5b4f24cd 100644 --- 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& 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 a796861d..0a913257 100644 --- 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& 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 16b9e7ae..079c368b 100644 --- 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 deb16ae1..476879fe 100644 --- 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 8e4585d4..5d47d594 100644 --- 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 9ae7d706..3be90962 100644 --- 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 532106bf..9f534ec9 100644 --- a/simgear/threads/SGQueue.hxx +++ b/simgear/threads/SGQueue.hxx @@ -183,7 +183,7 @@ public: /** * Destroy this queue. */ - ~SGBlockingQueue() { mutex.unlock(); } + ~SGBlockingQueue() {} /** *