General boost cleanup

simgear/canvas/layout/Layout.cxx

@@ -18,6 +18,9 @@
 
 #include <simgear_config.h>
 #include "Layout.hxx"
+
+#include <algorithm>
+
 #include <simgear/debug/logstream.hxx>
 
 namespace simgear

simgear/io/HTTPRequest.cxx

@@ -19,6 +19,7 @@
 #include "HTTPRequest.hxx"
 
 #include <cstring>
+#include <algorithm> // for std::min
 
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>

simgear/io/sg_binobj.hxx

@@ -34,18 +34,15 @@
 #include <simgear/math/sg_types.hxx>
 #include <simgear/math/SGMath.hxx>
 
-#include <vector>
+#include <array>
 #include <string>
-#include <boost/array.hpp>
+#include <vector>
 
 #define MAX_TC_SETS     (4)
 #define MAX_VAS         (8)
 
-// I really want to pass around fixed length arrays, as the size 
-// has to be hardcoded
-// but it's a C++0x feature use boost in its absence
-typedef boost::array<int_list, MAX_TC_SETS> tci_list;
-typedef boost::array<int_list, MAX_VAS>     vai_list;
+typedef std::array<int_list, MAX_TC_SETS> tci_list;
+typedef std::array<int_list, MAX_VAS>     vai_list;
 
 /** STL Structure used to store (integer index) object information */
 typedef std::vector < int_list > group_list;

simgear/misc/CSSBorder.cxx

@@ -18,7 +18,6 @@
 
 #include "CSSBorder.hxx"
 
-#include <boost/range.hpp>
 #include <boost/tokenizer.hpp>
 
 namespace simgear

simgear/nasal/cppbind/detail/nasal_traits.hxx

@@ -20,6 +20,7 @@
 #ifndef SG_NASAL_TRAITS_HXX_
 #define SG_NASAL_TRAITS_HXX_
 
+#include <memory>
 #include <simgear/std/type_traits.hxx>
 
 // Forward declarations
@@ -30,12 +31,6 @@ template<class T> class SGWeakPtr;
 template<class T> class SGVec2;
 template<class T> class SGVec4;
 
-namespace std
-{
-  template<class T> class shared_ptr;
-  template<class T> class weak_ptr;
-}
-
 namespace osg
 {
   class Referenced;

simgear/nasal/cppbind/detail/to_nasal_helper.hxx

@@ -27,7 +27,6 @@
 #include <simgear/nasal/cppbind/cppbind_fwd.hxx>
 #include <simgear/std/type_traits.hxx>
 
-#include <boost/function/function_fwd.hpp>
 #include <boost/call_traits.hpp>
 
 #include <array>

simgear/props/props.cxx

@@ -28,9 +28,9 @@ using std::cerr;
 #else
 # include <boost/algorithm/string/find_iterator.hpp>
 # include <boost/algorithm/string/predicate.hpp>
-# include <boost/algorithm/string/classification.hpp>
 # include <boost/functional/hash.hpp>
 # include <boost/range.hpp>
+
 # include <simgear/compiler.h>
 # include <simgear/debug/logstream.hxx>
 # include <simgear/sg_inlines.h>
@@ -162,7 +162,6 @@ parse_name (const SGPropertyNode *node, const Range &path)
 // Validate the name of a single node
 inline bool validateName(const std::string& name)
 {
-  using namespace boost;
   if (name.empty())
     return false;
   if (!isalpha(name[0]) && name[0] != '_')
@@ -2088,10 +2087,9 @@ SGPropertyNode::getNode (const char * relative_path, bool create)
   return find_node(this, components, 0, create);
 
 #else
-  using namespace boost;
-
-  return find_node(this, make_iterator_range(relative_path, relative_path
-                                             + strlen(relative_path)),
+  return find_node(this,
+                   boost::make_iterator_range(relative_path,
+                                              relative_path + strlen(relative_path)),
                    create);
 #endif
 }
@@ -2107,10 +2105,9 @@ SGPropertyNode::getNode (const char * relative_path, int index, bool create)
   return find_node(this, components, 0, create);
 
 #else
-  using namespace boost;
-
-  return find_node(this, make_iterator_range(relative_path, relative_path
-                                             + strlen(relative_path)),
+  return find_node(this,
+                   boost::make_iterator_range(relative_path,
+                                              relative_path + strlen(relative_path)),
                    create, index);
 #endif
 }

simgear/scene/material/Effect.cxx

@@ -36,7 +36,6 @@
 #include <mutex>
 
 #include <boost/functional/hash.hpp>
-#include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 
 #include <osg/AlphaFunc>

simgear/scene/material/TextureBuilder.cxx

@@ -39,7 +39,6 @@
 #include <OpenThreads/Mutex>
 #include <OpenThreads/ScopedLock>
 
-#include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 
 #include <simgear/scene/util/OsgMath.hxx>

simgear/scene/material/makeEffect.cxx

@@ -12,9 +12,6 @@
 #include <cstring>
 #include <map>
 
-#include <boost/tuple/tuple.hpp>
-#include <boost/tuple/tuple_comparison.hpp>
-
 #include <OpenThreads/ReentrantMutex>
 #include <OpenThreads/ScopedLock>
 

simgear/scene/material/mipmap.cxx

@@ -27,8 +27,6 @@
 #include <osg/Image>
 #include <osg/Vec4>
 
-#include <boost/tuple/tuple_comparison.hpp>
-
 namespace simgear { namespace effect {
 
 EffectNameValue<MipMapFunction> mipmapFunctionsInit[] =

simgear/scene/model/ModelRegistry.cxx

@@ -66,9 +66,6 @@
 #include "BoundingVolumeBuildVisitor.hxx"
 #include "model.hxx"
 
-#include <boost/tuple/tuple.hpp>
-#include <boost/tuple/tuple_comparison.hpp>
-
 using namespace std;
 using namespace osg;
 using namespace osgUtil;

simgear/scene/model/SGLightAnimation.cxx

@@ -31,7 +31,6 @@
 #include <simgear/scene/util/CopyOp.hxx>
 #include <simgear/scene/util/OsgMath.hxx>
 #include <simgear/scene/util/SGReaderWriterOptions.hxx>
-#include <boost/scoped_array.hpp>
 
 typedef std::map<std::string, osg::observer_ptr<simgear::Effect> > EffectMap;
 static EffectMap lightEffectMap;

simgear/scene/tgdb/SGBuildingBin.cxx

@@ -29,8 +29,6 @@
 #include <map>
 #include <math.h>
 
-#include <boost/tuple/tuple_comparison.hpp>
-
 #include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Math>

simgear/scene/tgdb/TreeBin.cxx

@@ -28,8 +28,6 @@
 #include <string>
 #include <map>
 
-#include <boost/tuple/tuple_comparison.hpp>
-
 #include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Math>