Added newlines and did other clean-ups to eliminate errors and

minimize warnings compiling with g++ 3.2.

diff --git a/simgear/scene/sky/clouds3d/SkyAABBTree.hpp b/simgear/scene/sky/clouds3d/SkyAABBTree.hpp
index 81fecddcc5d324a74fa7773ff3cffd66b8c65d10..56b723eede0d00b6219e99c4401b5869d5c1d5f5 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyAABBTree.hpp
+++ b/simgear/scene/sky/clouds3d/SkyAABBTree.hpp
@@ -16,4 +16,4 @@ template <class object>
 class SkyAABBTree : public SkyBVTree<object, SkyMinMaxBox, SkyAABBTreeSplitter<object> > 
 {};
 
-#endif //__SKYAABBTREE_HPP__
\ No newline at end of file
+#endif //__SKYAABBTREE_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyArchive.hpp b/simgear/scene/sky/clouds3d/SkyArchive.hpp
index a6aae02b8409ca218e36277194c72671f29d1974..0385f951da3582c2ca053642a691580a7b24fcb1 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyArchive.hpp
+++ b/simgear/scene/sky/clouds3d/SkyArchive.hpp
@@ -240,4 +240,4 @@ private:
     SKYRESULT       _Load(FILE* pSrcFile);
 };
 
-#endif //__SKYARCHIVE_HPP__
\ No newline at end of file
+#endif //__SKYARCHIVE_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyBVTree.hpp b/simgear/scene/sky/clouds3d/SkyBVTree.hpp
index d7aaa0129b14976045069a677de2eb7c237c166b..aa03dcac0421c40756977cacd398f00fb906eff8 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyBVTree.hpp
+++ b/simgear/scene/sky/clouds3d/SkyBVTree.hpp
@@ -294,4 +294,4 @@ private:
   std::vector<NodeObject> _objList;
 };
 
-#endif //__SKYBVTREE_HPP__
\ No newline at end of file
+#endif //__SKYBVTREE_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyBVTreeSplitter.hpp b/simgear/scene/sky/clouds3d/SkyBVTreeSplitter.hpp
index 83f251347b16b03a2b81324a8af40313c511a937..2bf1f543e3d385b3d87c0c0d7aa3442cf780235c 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyBVTreeSplitter.hpp
+++ b/simgear/scene/sky/clouds3d/SkyBVTreeSplitter.hpp
@@ -239,4 +239,4 @@ private:
        SkyBoundingBoxSplitter<Object> _splitter;
 };*/
 
-#endif //__SKYBVTREESPLITTER_HPP__
\ No newline at end of file
+#endif //__SKYBVTREESPLITTER_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyBoundingVolume.hpp b/simgear/scene/sky/clouds3d/SkyBoundingVolume.hpp
index 9f2242cd6da46ffbab7db99ce8ee3bda8067f5e7..1e5ee026f207e57401833e84e1e11a57a496983a 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyBoundingVolume.hpp
+++ b/simgear/scene/sky/clouds3d/SkyBoundingVolume.hpp
@@ -148,4 +148,4 @@ protected:
   float        _rRadius;
 };
 
-#endif //__SKYBOUNDINGVOLUME_HPP__
\ No newline at end of file
+#endif //__SKYBOUNDINGVOLUME_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyCloud.hpp b/simgear/scene/sky/clouds3d/SkyCloud.hpp
index 6eeb5bbc2c7ae433f5b36f921f0dd546aa29f472..24b2d3a69d9ffb864d2e883c0dca0303ff9c0be7 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyCloud.hpp
+++ b/simgear/scene/sky/clouds3d/SkyCloud.hpp
@@ -172,4 +172,4 @@ protected: // data
   static float                s_rSortSquareDistanceTolerance; // how far the view must move to cause a resort.
 };
 
-#endif //__SKYCLOUD_HPP__
\ No newline at end of file
+#endif //__SKYCLOUD_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyCloudParticle.hpp b/simgear/scene/sky/clouds3d/SkyCloudParticle.hpp
index 0b9c15b73c4f0ec5e8d783fe0d3fdf722b6df11a..90e6a3344ed34929bc77a477cb2a3b50068c14f6 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyCloudParticle.hpp
+++ b/simgear/scene/sky/clouds3d/SkyCloudParticle.hpp
@@ -172,4 +172,4 @@ inline const Vec4f& SkyCloudParticle::GetLitColor(unsigned int index) const
     return Vec4f::ZERO;
 }
 
-#endif //__SKYCLOUDPARTICLE_HPP__
\ No newline at end of file
+#endif //__SKYCLOUDPARTICLE_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyContext.hpp b/simgear/scene/sky/clouds3d/SkyContext.hpp
index e6d08040c61d0e86415b4162ac3a8ac4cf5794d7..fcf0d18f9bfbf97a5cbff80537beb8b656ae7748 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyContext.hpp
+++ b/simgear/scene/sky/clouds3d/SkyContext.hpp
@@ -138,4 +138,4 @@ protected: // data
 
 };
 
-#endif //__SKYCONTEXT_HPP__
\ No newline at end of file
+#endif //__SKYCONTEXT_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp b/simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp
index 57f09bbdf714519a9ed6cfc8a09bba34d86b78ba..f16060a99f2eed746614b12a622b5b35c0018dcd 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp
+++ b/simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp
@@ -77,4 +77,4 @@ protected: // data
   unsigned int    _iNumTextureBytesCheckedIn;
 };
 
-#endif //__SKYDYNAMICTEXTUREMANAGER_HPP__
\ No newline at end of file
+#endif //__SKYDYNAMICTEXTUREMANAGER_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyLight.cpp b/simgear/scene/sky/clouds3d/SkyLight.cpp
index b3d4cb3ce3f8dfe2866b29fc9ce4b7e50426afd6..c71f16578e2e01b2090c42c90e3f7f910c82f3f4 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyLight.cpp
+++ b/simgear/scene/sky/clouds3d/SkyLight.cpp
@@ -218,4 +218,4 @@ SKYRESULT SkyLight::Activate(int iLightID)
   glPopMatrix();
  
   return SKYRESULT_OK;
-}
\ No newline at end of file
+}

diff --git a/simgear/scene/sky/clouds3d/SkyLight.hpp b/simgear/scene/sky/clouds3d/SkyLight.hpp
index b78fb11e6fb63e477d9ae9924a40d56f16fa752f..e7d62494c3b74551657b866586cdcbef8e3e7a4d 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyLight.hpp
+++ b/simgear/scene/sky/clouds3d/SkyLight.hpp
@@ -94,4 +94,4 @@ protected: // data
   static SkyMaterial *s_pMaterial;  // used for rendering the lights during debugging
 };
 
-#endif //__SKYLIGHT_HPP__
\ No newline at end of file
+#endif //__SKYLIGHT_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyMaterial.hpp b/simgear/scene/sky/clouds3d/SkyMaterial.hpp
index cf3a1d50870151dcd88108c6ac68280f5e6fd8ec..255f8f9225a06fde7f9b52d88e706256f982c74f 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyMaterial.hpp
+++ b/simgear/scene/sky/clouds3d/SkyMaterial.hpp
@@ -265,4 +265,4 @@ protected:
   GLenum        _eTextureEnvMode;
 };
 
-#endif //__SKYMATERIAL_HPP__
\ No newline at end of file
+#endif //__SKYMATERIAL_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp b/simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp
index 968470fe7c4d0e6f886d2f18e4d29ae100706e03..6c28790a5acd06b010085e0e1ead566b4e6bc34c 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp
+++ b/simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp
@@ -319,4 +319,4 @@ void SkyMinMaxBox::_CalcVerts(Vec3f pVerts[8]) const
   pVerts[1].Set(_min.x, _max.y, _max.z); pVerts[5].Set(_min.x, _max.y, _min.z);
   pVerts[2].Set(_min.x, _min.y, _max.z); pVerts[6].Set(_min);
   pVerts[3].Set(_max.x, _min.y, _max.z); pVerts[7].Set(_max.x, _min.y, _min.z);
-}
\ No newline at end of file
+}

diff --git a/simgear/scene/sky/clouds3d/SkyMinMaxBox.hpp b/simgear/scene/sky/clouds3d/SkyMinMaxBox.hpp
index 6a3851982579ed3e3ef5ad00b6abe8295f0626cc..aebfa5dc418c7ed546ea4ab7ddaa91eacb3155ca 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyMinMaxBox.hpp
+++ b/simgear/scene/sky/clouds3d/SkyMinMaxBox.hpp
@@ -82,4 +82,4 @@ private:
        Vec3f _max;
 };
 
-#endif //__SKYMINMAXBOX_HPP__
\ No newline at end of file
+#endif //__SKYMINMAXBOX_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyRenderable.hpp b/simgear/scene/sky/clouds3d/SkyRenderable.hpp
index 8364095343f1dd9a77c421a3c87b47de115e8a3d..8f224ae93afa93f5a9095b021d9f9d13eb3a7bcf 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderable.hpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderable.hpp
@@ -113,4 +113,4 @@ protected:
   std::string         _name; // the name of this renderable.
 };
 
-#endif //__SKYRENDERABLE_HPP__
\ No newline at end of file
+#endif //__SKYRENDERABLE_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstance.hpp b/simgear/scene/sky/clouds3d/SkyRenderableInstance.hpp
index c483999ae547e6223e262c83fde167ac2fc65dd2..9c09a509a57ac424c2b330c13d5abcb37719ff8d 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstance.hpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstance.hpp
@@ -199,4 +199,4 @@ inline void SkyRenderableInstance::GetWorldToModelTransform(Mat44f &mat) const
   mat[15] = 1;
 }
 
-#endif //__SKYRENDERABLEINSTANCE_HPP__
\ No newline at end of file
+#endif //__SKYRENDERABLEINSTANCE_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp b/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
index 2f404034cb35ed647b7588f82983f0fb7144c58e..b83f0f12dd30248e812067b058957ae3312c78e7 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
@@ -68,7 +68,7 @@ SkyRenderableInstanceCloud::SkyRenderableInstanceCloud(SkyCloud *pCloud,
   _iCulledCount(0)
 {
   _Initialize();
-  cout << "Cloud Instance created" << endl;
+//   cout << "Cloud Instance created" << endl;
 }
 
 //------------------------------------------------------------------------------

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.hpp b/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.hpp
index e7bac3de54705732165cf8dadd7516356a77fcc4..5cbd4f6ff476b74eab74839c8aea3fdd7f475263 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.hpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.hpp
@@ -270,4 +270,4 @@ inline void SkyRenderableInstanceCloud::_UpdateWorldSpaceBounds()
   _vecPosition = _pCloud->CopyBoundingVolume()->GetCenter();
 }
 
-#endif //__SKYRENDERABLEINSTANCECLOUD_HPP__
\ No newline at end of file
+#endif //__SKYRENDERABLEINSTANCECLOUD_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstanceGeneric.hpp b/simgear/scene/sky/clouds3d/SkyRenderableInstanceGeneric.hpp
index b69d26a2748764252969e78c22ef7dfcc996d70d..461f3b0aaff70f93745dc85dc1b5d195beec0481 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstanceGeneric.hpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstanceGeneric.hpp
@@ -73,4 +73,4 @@ protected:
   SkyMinMaxBox      *_pBV;          // Pointer to bounding volume
 };
 
-#endif //__SKYRENDERABLEINSTANCEGENERIC_HPP__
\ No newline at end of file
+#endif //__SKYRENDERABLEINSTANCEGENERIC_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp b/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp
index dbd8871d16c8ef42150356c814b02d5615538356..2fa497a82f348f70d82ad1a14a216204f891bf8a 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp
@@ -175,4 +175,4 @@ void SkyRenderableInstanceGroup::AddSubInstance(SkyRenderableInstance *pInstance
     _pObjectSpaceBV->AddPoint(xform * min);
     _pObjectSpaceBV->AddPoint(xform * max);
   } 
-}
\ No newline at end of file
+}

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.hpp b/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.hpp
index 1557003b2822ebd930e86444adfa706c9ab2fa32..6ec8d6a9d3f6bb71793097d87c38e630f1ea6b82 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.hpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.hpp
@@ -60,4 +60,4 @@ protected:
 };
 
 
-#endif //__SKYRENDERABLEINSTANCEGROUP_HPP__
\ No newline at end of file
+#endif //__SKYRENDERABLEINSTANCEGROUP_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkySceneManager.cpp b/simgear/scene/sky/clouds3d/SkySceneManager.cpp
index 726eed3f83786489e23f255886092ab48ff0781d..6b1b2a7633ce59779f97abf67a2254c6fd350a44 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkySceneManager.cpp
+++ b/simgear/scene/sky/clouds3d/SkySceneManager.cpp
@@ -293,7 +293,8 @@ SkyMaterial* SkySceneManager::GetMaterial(int iMaterialID)
  * @todo <WRITE EXTENDED SkySceneManager::ActivateMaterial FUNCTION DOCUMENTATION>
  */ 
 SKYRESULT SkySceneManager::ActivateMaterial(int iMaterialID)
-{\rcout  << "Activating material\n"; char mm; cin >> mm;
+{
+//   cout  << "Activating material\n"; char mm; cin >> mm;
   MaterialIterator mi = _materials.find(iMaterialID);
   if (_materials.end() == mi)
   {
@@ -478,7 +479,8 @@ SKYRESULT SkySceneManager::RebuildCloudBVTree()
  * @todo <WRITE EXTENDED SkySceneManager::ShadeClouds FUNCTION DOCUMENTATION>
  */ 
 SKYRESULT SkySceneManager::ShadeClouds()
-{\rcout  <<  "SkySceneManager::ShadeClouds()\n";
+{
+//   cout  <<  "SkySceneManager::ShadeClouds()\n";
   int i=0;
   
   for (CloudInstanceIterator cii = _cloudInstances.begin(); cii != _cloudInstances.end(); ++cii)
@@ -489,7 +491,7 @@ SKYRESULT SkySceneManager::ShadeClouds()
       if (SkyLight::SKY_LIGHT_DIRECTIONAL == li->second->GetType())
       {
         (*cii)->GetCloud()->Illuminate(li->second, *cii, li == _lights.begin());
-        printf("Shading Cloud %d of %d with light %d \n", i++, _cloudInstances.size(), *li );
+//         printf("Shading Cloud %d of %d with light %d \n", i++, _cloudInstances.size(), *li );
       }
     }
   }
@@ -750,7 +752,8 @@ SKYRESULT SkySceneManager::_ResolveVisibility(const Camera &cam)
 
   // opaque instances
   for (ii = _instances.begin(); ii != _instances.end(); ++ii)
-  {\rcout <<  "Opague instance\n"; char zz; cin >> zz;
+  {
+//     cout <<  "Opague instance\n"; char zz; cin >> zz;
     (*ii)->ViewFrustumCull(cam);  // First VFC then check if culled, some instances may
     // manually set the culled flag, instead of using VFC  
     if (!(*ii)->IsCulled())
@@ -765,7 +768,8 @@ SKYRESULT SkySceneManager::_ResolveVisibility(const Camera &cam)
 
   // transparent instances
   for (ii = _transparentInstances.begin(); ii != _transparentInstances.end(); ++ii)
-  {\rcout << "Transparent instance\n"; char tt; cin >> tt;
+  {
+//     cout << "Transparent instance\n"; char tt; cin >> tt;
     (*ii)->ViewFrustumCull(cam);  // First VFC then check if culled, some instances may
     // manually set the culled flag, instead of using VFC  
     if (!(*ii)->IsCulled())

diff --git a/simgear/scene/sky/clouds3d/SkySceneManager.hpp b/simgear/scene/sky/clouds3d/SkySceneManager.hpp
index 054c5176cb6c9d64f0f0b8c50c20bb18a5a11532..8926d396dd6e83fe135892e65cf8c044d08305b6 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkySceneManager.hpp
+++ b/simgear/scene/sky/clouds3d/SkySceneManager.hpp
@@ -185,4 +185,4 @@ private: // data
   bool                _bReshadeClouds;
 };
 
-#endif //__SKYSCENEMANAGER_HPP__  
\ No newline at end of file
+#endif //__SKYSCENEMANAGER_HPP__  

diff --git a/simgear/scene/sky/clouds3d/SkySingleton.hpp b/simgear/scene/sky/clouds3d/SkySingleton.hpp
index e8aeaf6fa3ed136cac83c2a89102033877713e53..ad40843048e8391afc3f9bf285b2692f85826503 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkySingleton.hpp
+++ b/simgear/scene/sky/clouds3d/SkySingleton.hpp
@@ -289,4 +289,4 @@ private:
 // declare the static instance pointer
 template<class T> SkySingleton<T>* SkySingleton<T>::s_pInstance = NULL;
 
-#endif //__SKYSINGLETON_HPP__
\ No newline at end of file
+#endif //__SKYSINGLETON_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyTexture.hpp b/simgear/scene/sky/clouds3d/SkyTexture.hpp
index 50790118995770dd4d9b1e8827d07bce48c25332..5bb515c270c5ea5b63ced4b56cf9421fdbd71df7 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTexture.hpp
+++ b/simgear/scene/sky/clouds3d/SkyTexture.hpp
@@ -93,4 +93,4 @@ inline SKYRESULT SkyTexture::Destroy()
   return SKYRESULT_OK;
 }
 
-#endif //__SKYTEXTURE_HPP__
\ No newline at end of file
+#endif //__SKYTEXTURE_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyTextureManager.cpp b/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
index 715971b7ed1c3e3ae5f966be4c915277f02beaaa..346d7e785b48f5c93756c6bf04757250d1e2d0ee 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
@@ -285,7 +285,7 @@ SKYRESULT SkyTextureManager::Clone2DTexture(const string &filename,
   if (!pImageData)
   {
     char buffer[256];
-    sprintf(buffer, "SkyTextureManager::Clone2DTexture(): Could not load image. %s.\n", filename);
+    sprintf(buffer, "SkyTextureManager::Clone2DTexture(): Could not load image. %s.\n", filename.c_str());
     FAIL_RETURN_MSG(SKYRESULT_OK, buffer);
   }
 
@@ -880,4 +880,4 @@ void SkyTextureManager::DestroyTextureObject(SkyTexture &texture)
     glDeleteTextures(texture.iDepth, texture.pSliceIDs);
     delete [] texture.pSliceIDs;
   }*/
-}
\ No newline at end of file
+}

diff --git a/simgear/scene/sky/clouds3d/SkyTextureState.cpp b/simgear/scene/sky/clouds3d/SkyTextureState.cpp
index 5495ce1c3dd60c1e388c407b46702e5e7206b44e..e8ee29b2cdeb78d3257da631ec1e020fb137755f 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTextureState.cpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureState.cpp
@@ -268,4 +268,5 @@ SKYRESULT SkyTextureState::SetTextureParameter(unsigned int iTextureUnit,
   }
   
   return SKYRESULT_OK;
-}
\ No newline at end of file
+}
+

diff --git a/simgear/scene/sky/clouds3d/SkyTextureState.hpp b/simgear/scene/sky/clouds3d/SkyTextureState.hpp
index 1df2d39de5fde8d54706ce016abc91d842bc0349..24312919315c381de6e40efe38acd0c59e0da6ff 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTextureState.hpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureState.hpp
@@ -202,4 +202,4 @@ inline GLenum SkyTextureState::GetTextureParameter(unsigned int iTextureUnit, GL
   return GL_NONE;
 }
 
-#endif //__SKYTEXTURESTATE_HPP__
\ No newline at end of file
+#endif //__SKYTEXTURESTATE_HPP__

diff --git a/simgear/scene/sky/clouds3d/SkyUtil.hpp b/simgear/scene/sky/clouds3d/SkyUtil.hpp
index 9e020f69c61b419060f79aa05522674fac5624c6..5467f6de8ce0d21b43d47a550a29130a34e5d658 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyUtil.hpp
+++ b/simgear/scene/sky/clouds3d/SkyUtil.hpp
@@ -189,4 +189,4 @@ enum SKYRESULT_CODES
        #define FAIL_RETURN_MSGBOX(p,str) p
 #endif
 
-#endif //__SKYUTIL_HPP__
\ No newline at end of file
+#endif //__SKYUTIL_HPP__

diff --git a/simgear/scene/sky/clouds3d/camera.cpp b/simgear/scene/sky/clouds3d/camera.cpp
index c5b89fa48911ece6f098a5bcad46fe1a4565d8a2..86078376d71271f5d76cb6b37156d47fb33b1b72 100644 (file)
--- a/simgear/scene/sky/clouds3d/camera.cpp
+++ b/simgear/scene/sky/clouds3d/camera.cpp
@@ -21,7 +21,7 @@
 // $Id$
 //============================================================================
 #include "camera.hpp"
-#include <iostream.h>
+#include <iostream>
 
 //----------------------------------------------------------------------------
 // CONSTRUCTOR: defines a default camera system defined as (45 DEG FOV)