Changeset 10733 for code/branches/cpp11_v2/src/libraries

Timestamp:

Oct 31, 2015, 6:11:53 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11 to cpp11_v2

Location:

code/branches/cpp11_v2

Files:

• . (modified) (1 prop)
• src/libraries/core/config/ConfigFile.cc (modified) (2 diffs)
• src/libraries/core/object/ObjectListBase.h (modified) (1 diff)
• src/libraries/tools/BulletDebugDrawer.h (modified) (1 diff)
• src/libraries/tools/OgreBulletUtils.h (modified) (2 diffs)
• src/libraries/util/SmallObjectAllocator.h (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc

@@ -35 +35 @@
 
 #include <boost/filesystem.hpp>
+
+#include <iterator>
+#include <algorithm>
 
 #include "util/Convert.h"
@@ -93 +96 @@
                         try
                         {
-                            boost::filesystem::copy_file(defaultFilepath, filepath);
+                            std::ifstream input(defaultFilepath.string().c_str(), std::ifstream::in | std::ifstream::binary);
+                            std::ofstream output(filepath.string().c_str(), std::ofstream::out | std::ofstream::binary);
+                            copy(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>(), std::ostream_iterator<char>(output));
                             orxout(internal_info, context::config) << "Copied " << this->filename_ << " from the default config folder." << endl;
                         }

code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h

@@ -93 +93 @@
             }
 
+            operator T*()
+            {
+                return object_;
+            }
+
             T* object_;              //!< The object
     };

code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h

@@ -13 +13 @@
 #include <btBulletCollisionCommon.h>
 #include <OgreFrameListener.h>
+#include <OgreVector3.h>
+#include <OgreColourValue.h>
 
 namespace orxonox

code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h

@@ -10 +10 @@
 
 #include "tools/ToolsPrereqs.h"
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
+#include <OgreMatrix3.h>
+#include <OgreMatrix4.h>
 
 namespace orxonox
@@ -42 +47 @@
     inline Ogre::Matrix3 matrix3(const btMatrix3x3& matrix)
     {
-        return Matrix3(
+        return Ogre::Matrix3(
                 matrix[0][0], matrix[0][1], matrix[0][2],
                 matrix[1][0], matrix[1][1], matrix[1][2],

code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h

@@ -77 +77 @@
 #include "UtilPrereqs.h"
 #include <vector>
+#include <cstdio>
 
 namespace orxonox