From: ehofman Date: Tue, 21 Feb 2006 10:47:20 +0000 (+0000) Subject: Back out the previous patch. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b2a4cd488dfcfbf1d02fa41f2dfa5ad39aabb13a;p=simgear.git Back out the previous patch. --- diff --git a/simgear/bucket/newbucket.cxx b/simgear/bucket/newbucket.cxx index 6a4b2ecb..9a913628 100644 --- a/simgear/bucket/newbucket.cxx +++ b/simgear/bucket/newbucket.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/bucket/newbucket.hxx b/simgear/bucket/newbucket.hxx index 2ba7de55..b7ad1deb 100644 --- a/simgear/bucket/newbucket.hxx +++ b/simgear/bucket/newbucket.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/compiler.h b/simgear/compiler.h index 40bb0855..ed3f9f1b 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -11,9 +11,10 @@ * 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 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. + * 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. * * $Id$ * diff --git a/simgear/constants.h b/simgear/constants.h index 0ce5ab9e..b77a7965 100644 --- a/simgear/constants.h +++ b/simgear/constants.h @@ -14,9 +14,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/debug/logstream.cxx b/simgear/debug/logstream.cxx index 255eae07..c47d4c8b 100644 --- a/simgear/debug/logstream.cxx +++ b/simgear/debug/logstream.cxx @@ -14,9 +14,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx index 98e5e326..f81cc0b4 100644 --- a/simgear/debug/logstream.hxx +++ b/simgear/debug/logstream.hxx @@ -16,9 +16,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/environment/metar.cxx b/simgear/environment/metar.cxx index d0dd28c1..c6da78de 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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA // // $Id$ diff --git a/simgear/environment/metar.hxx b/simgear/environment/metar.hxx index 3db6f4d8..a446152d 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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA // // $Id$ diff --git a/simgear/environment/visual_enviro.cxx b/simgear/environment/visual_enviro.cxx index 32140a56..01b9a9f1 100644 --- a/simgear/environment/visual_enviro.cxx +++ b/simgear/environment/visual_enviro.cxx @@ -16,9 +16,10 @@ // // 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. +// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA // // + #ifdef HAVE_CONFIG_H # include #endif diff --git a/simgear/environment/visual_enviro.hxx b/simgear/environment/visual_enviro.hxx index 33f53c75..946c169c 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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA // // #ifndef _VISUAL_ENVIRO_HXX diff --git a/simgear/ephemeris/celestialBody.cxx b/simgear/ephemeris/celestialBody.cxx index 8a1539cc..2a7f5563 100644 --- a/simgear/ephemeris/celestialBody.cxx +++ b/simgear/ephemeris/celestialBody.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/celestialBody.hxx b/simgear/ephemeris/celestialBody.hxx index 6572a45c..43b1d480 100644 --- a/simgear/ephemeris/celestialBody.hxx +++ b/simgear/ephemeris/celestialBody.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ @@ -26,9 +27,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 46c7df2c..31ceb01f 100644 --- a/simgear/ephemeris/ephemeris.cxx +++ b/simgear/ephemeris/ephemeris.cxx @@ -15,9 +15,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/ephemeris/ephemeris.hxx b/simgear/ephemeris/ephemeris.hxx index e8fd02cf..c00d0963 100644 --- a/simgear/ephemeris/ephemeris.hxx +++ b/simgear/ephemeris/ephemeris.hxx @@ -19,9 +19,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/ephemeris/jupiter.cxx b/simgear/ephemeris/jupiter.cxx index 1c16e119..79687ac7 100644 --- a/simgear/ephemeris/jupiter.cxx +++ b/simgear/ephemeris/jupiter.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/jupiter.hxx b/simgear/ephemeris/jupiter.hxx index e5d7e4c9..04bf19c0 100644 --- a/simgear/ephemeris/jupiter.hxx +++ b/simgear/ephemeris/jupiter.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/mars.cxx b/simgear/ephemeris/mars.cxx index 57b4165d..a1879ee2 100644 --- a/simgear/ephemeris/mars.cxx +++ b/simgear/ephemeris/mars.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/mars.hxx b/simgear/ephemeris/mars.hxx index a7201cbf..307f3812 100644 --- a/simgear/ephemeris/mars.hxx +++ b/simgear/ephemeris/mars.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/mercury.cxx b/simgear/ephemeris/mercury.cxx index 6651ed67..7ed8b1f5 100644 --- a/simgear/ephemeris/mercury.cxx +++ b/simgear/ephemeris/mercury.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/mercury.hxx b/simgear/ephemeris/mercury.hxx index 649e4e41..aecf8dc1 100644 --- a/simgear/ephemeris/mercury.hxx +++ b/simgear/ephemeris/mercury.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/moonpos.cxx b/simgear/ephemeris/moonpos.cxx index 4f8ca09f..9ff25518 100644 --- a/simgear/ephemeris/moonpos.cxx +++ b/simgear/ephemeris/moonpos.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/moonpos.hxx b/simgear/ephemeris/moonpos.hxx index 6163249c..96092b9f 100644 --- a/simgear/ephemeris/moonpos.hxx +++ b/simgear/ephemeris/moonpos.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/neptune.cxx b/simgear/ephemeris/neptune.cxx index 2fbe7598..e74744bf 100644 --- a/simgear/ephemeris/neptune.cxx +++ b/simgear/ephemeris/neptune.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/neptune.hxx b/simgear/ephemeris/neptune.hxx index 0bbccef9..81f75ff5 100644 --- a/simgear/ephemeris/neptune.hxx +++ b/simgear/ephemeris/neptune.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/pluto.hxx b/simgear/ephemeris/pluto.hxx index 072e87f8..54b4246d 100644 --- a/simgear/ephemeris/pluto.hxx +++ b/simgear/ephemeris/pluto.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/saturn.cxx b/simgear/ephemeris/saturn.cxx index eed07711..fcb12a1f 100644 --- a/simgear/ephemeris/saturn.cxx +++ b/simgear/ephemeris/saturn.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/saturn.hxx b/simgear/ephemeris/saturn.hxx index 79a9ae40..c1731ade 100644 --- a/simgear/ephemeris/saturn.hxx +++ b/simgear/ephemeris/saturn.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/star.cxx b/simgear/ephemeris/star.cxx index 0bf3451d..86450380 100644 --- a/simgear/ephemeris/star.cxx +++ b/simgear/ephemeris/star.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/star.hxx b/simgear/ephemeris/star.hxx index 781cfcd6..81419e79 100644 --- a/simgear/ephemeris/star.hxx +++ b/simgear/ephemeris/star.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/stardata.cxx b/simgear/ephemeris/stardata.cxx index 4c703cf9..86583ea4 100644 --- a/simgear/ephemeris/stardata.cxx +++ b/simgear/ephemeris/stardata.cxx @@ -14,9 +14,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/ephemeris/stardata.hxx b/simgear/ephemeris/stardata.hxx index 7f207888..7f675b45 100644 --- a/simgear/ephemeris/stardata.hxx +++ b/simgear/ephemeris/stardata.hxx @@ -14,9 +14,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/ephemeris/uranus.cxx b/simgear/ephemeris/uranus.cxx index a3e9162c..7062c3c7 100644 --- a/simgear/ephemeris/uranus.cxx +++ b/simgear/ephemeris/uranus.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/uranus.hxx b/simgear/ephemeris/uranus.hxx index 4a760b58..5932822b 100644 --- a/simgear/ephemeris/uranus.hxx +++ b/simgear/ephemeris/uranus.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/venus.cxx b/simgear/ephemeris/venus.cxx index 0e37bbf2..10e498cc 100644 --- a/simgear/ephemeris/venus.cxx +++ b/simgear/ephemeris/venus.cxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/ephemeris/venus.hxx b/simgear/ephemeris/venus.hxx index 4b415e5f..4f48d0a8 100644 --- a/simgear/ephemeris/venus.hxx +++ b/simgear/ephemeris/venus.hxx @@ -15,9 +15,10 @@ * 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 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. + * 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. * * $Id$ **************************************************************************/ diff --git a/simgear/io/iochannel.cxx b/simgear/io/iochannel.cxx index 9b88c6d5..994aa89f 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/iochannel.hxx b/simgear/io/iochannel.hxx index a0392a34..48c782a1 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/lowlevel.cxx b/simgear/io/lowlevel.cxx index 19909b7d..fd90c717 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/lowlevel.hxx b/simgear/io/lowlevel.hxx index 0f650d5b..a8af66ae 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ // diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx index ba4cfc60..ffe58a0b 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ // diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx index 542a333a..ae3ccad5 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/sg_file.cxx b/simgear/io/sg_file.cxx index 0505cac4..dace6454 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/sg_file.hxx b/simgear/io/sg_file.hxx index 9f91af34..ab3f7be0 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/sg_serial.cxx b/simgear/io/sg_serial.cxx index c9b8865f..f6eb07c0 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx index b7c8553d..bb51ce33 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/sg_socket.cxx b/simgear/io/sg_socket.cxx index 433415dc..b45b551b 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/sg_socket.hxx b/simgear/io/sg_socket.hxx index f54e090d..b1965c51 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/sg_socket_udp.cxx b/simgear/io/sg_socket_udp.cxx index 97f0d8e0..7c0a0d60 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/io/sg_socket_udp.hxx b/simgear/io/sg_socket_udp.hxx index 731909af..89d4f2d7 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/magvar/coremag.cxx b/simgear/magvar/coremag.cxx index 660f730e..cccf753a 100644 --- a/simgear/magvar/coremag.cxx +++ b/simgear/magvar/coremag.cxx @@ -57,9 +57,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/magvar/coremag.hxx b/simgear/magvar/coremag.hxx index 42eeacae..3c567fa0 100644 --- a/simgear/magvar/coremag.hxx +++ b/simgear/magvar/coremag.hxx @@ -26,9 +26,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/magvar/magvar.cxx b/simgear/magvar/magvar.cxx index 11f59b8b..0e030d02 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // // $Id$ diff --git a/simgear/magvar/magvar.hxx b/simgear/magvar/magvar.hxx index c2e80bc4..c72c8e60 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 b0595f29..e9955884 100644 --- a/simgear/math/.cvsignore +++ b/simgear/math/.cvsignore @@ -1,4 +1,3 @@ .deps Makefile Makefile.in -SGMathTest diff --git a/simgear/math/SGGeoc.hxx b/simgear/math/SGGeoc.hxx index 72af480c..6810be30 100644 --- a/simgear/math/SGGeoc.hxx +++ b/simgear/math/SGGeoc.hxx @@ -28,13 +28,12 @@ class SGGeoc { public: /// Default constructor, initializes the instance to lat = lon = lat = 0 SGGeoc(void); -// 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. + /// Initialize from a cartesian vector assumed to be in meters /// Note that this conversion is relatively expensive to compute - SGGeoc(const SGGeod& geod); - SGGeoc(const SGVec3& cart); + /// Initialize from a geodetic position + /// Note that this conversion is relatively expensive to compute + SGGeoc(const SGGeod& geod); /// Factory from angular values in radians and radius in ft static SGGeoc fromRadFt(double lon, double lat, double radius); diff --git a/simgear/math/SGGeod.hxx b/simgear/math/SGGeod.hxx index 63d09935..a796861d 100644 --- a/simgear/math/SGGeod.hxx +++ b/simgear/math/SGGeod.hxx @@ -28,13 +28,12 @@ class SGGeod { public: /// Default constructor, initializes the instance to lat = lon = elev = 0 SGGeod(void); -// 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. + /// Initialize from a cartesian vector assumed to be in meters /// Note that this conversion is relatively expensive to compute - SGGeod(const SGGeoc& geoc); - SGGeod(const SGVec3& cart); + /// Initialize from a geocentric position + /// Note that this conversion is relatively expensive to compute + SGGeod(const SGGeoc& geoc); /// Factory from angular values in radians and elevation is 0 static SGGeod fromRad(double lon, double lat); diff --git a/simgear/math/SGGeodesy.cxx b/simgear/math/SGGeodesy.cxx index 079c368b..16b9e7ae 100644 --- a/simgear/math/SGGeodesy.cxx +++ b/simgear/math/SGGeodesy.cxx @@ -27,9 +27,10 @@ // These are hard numbers from the WGS84 standard. DON'T MODIFY // unless you want to change the datum. #define _EQURAD 6378137.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 _FLATTENING 298.257223563 + +// These are derived quantities more useful to the code: +#if 0 #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 476879fe..deb16ae1 100644 --- a/simgear/math/SGGeodesy.hxx +++ b/simgear/math/SGGeodesy.hxx @@ -28,9 +28,10 @@ class SGVec3; class SGGeodesy { public: // Hard numbers from the WGS84 standard. -// 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 EQURAD; + static const double iFLATTENING; + static const double SQUASH; + static const double STRETCH; static const double POLRAD; /// Takes a cartesian coordinate data and returns the geodetic diff --git a/simgear/screen/tr.cxx b/simgear/screen/tr.cxx index 16841094..53e1bf82 100644 --- a/simgear/screen/tr.cxx +++ b/simgear/screen/tr.cxx @@ -2,6 +2,9 @@ /* * $Log$ + * Revision 1.3 2006/02/21 10:47:21 ehofman + * Back out the previous patch. + * * Revision 1.2 2004/11/18 19:10:34 curt * Abstract out location of gl.h, glut.h, and glu.h includes so that we can * make the Mac platform happy since they put these in a different place compared diff --git a/simgear/screen/tr.h b/simgear/screen/tr.h index e276b5db..8ef88bac 100644 --- a/simgear/screen/tr.h +++ b/simgear/screen/tr.h @@ -2,6 +2,9 @@ /* * $Log$ + * Revision 1.3 2006/02/21 10:47:21 ehofman + * Back out the previous patch. + * * Revision 1.2 2004/11/18 19:10:34 curt * Abstract out location of gl.h, glut.h, and glu.h includes so that we can * make the Mac platform happy since they put these in a different place compared diff --git a/simgear/sg_inlines.h b/simgear/sg_inlines.h index 5d47d594..8e4585d4 100644 --- a/simgear/sg_inlines.h +++ b/simgear/sg_inlines.h @@ -17,9 +17,10 @@ // 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 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. +// 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. // // $Id$ diff --git a/simgear/structure/subsystem_mgr.cxx b/simgear/structure/subsystem_mgr.cxx index 3be90962..9ae7d706 100644 --- a/simgear/structure/subsystem_mgr.cxx +++ b/simgear/structure/subsystem_mgr.cxx @@ -224,7 +224,8 @@ SGSubsystemGroup::Member::Member (const Member &) SGSubsystemGroup::Member::~Member () { - delete subsystem; + // FIXME: causes a crash +// delete subsystem; } void diff --git a/simgear/threads/SGQueue.hxx b/simgear/threads/SGQueue.hxx index 9f534ec9..532106bf 100644 --- a/simgear/threads/SGQueue.hxx +++ b/simgear/threads/SGQueue.hxx @@ -183,7 +183,7 @@ public: /** * Destroy this queue. */ - ~SGBlockingQueue() {} + ~SGBlockingQueue() { mutex.unlock(); } /** *