Changeset 2728 for code/trunk/src/core

Timestamp:

Mar 2, 2009, 1:47:42 PM (16 years ago)

Author:

rgrieder

Message:

Updated to the new tardis libraries. Seems to work fine.

File:

• code/trunk/src/core/ArgumentCompletionFunctions.cc (modified) (3 diffs)

code/trunk/src/core/ArgumentCompletionFunctions.cc

@@ -31 +31 @@
 #include <iostream>
 #include <map>
+#include <boost/version.hpp>
 #include <boost/filesystem.hpp>
 
@@ -39 +40 @@
 #include "util/Convert.h"
 #include "util/String.h"
+
+// Boost 1.36 has some issues with deprecated functions that have been omitted
+#if (BOOST_VERSION == 103600)
+#  define BOOST_LEAF_FUNCTION filename
+#else
+#  define BOOST_LEAF_FUNCTION leaf
+#endif
 
 namespace orxonox
@@ -78 +86 @@
                 {
                     if (boost::filesystem::is_directory(*file))
-                        dirlist.push_back(ArgumentCompletionListElement((*file).string() + CP_SLASH, getLowercase((*file).string()) + "/", (*file).leaf() + "/"));
+                        dirlist.push_back(ArgumentCompletionListElement((*file).string() + CP_SLASH, getLowercase((*file).string()) + "/", (*file).BOOST_LEAF_FUNCTION() + "/"));
                     else
-                        filelist.push_back(ArgumentCompletionListElement((*file).string(), getLowercase((*file).string()), (*file).leaf()));
+                        filelist.push_back(ArgumentCompletionListElement((*file).string(), getLowercase((*file).string()), (*file).BOOST_LEAF_FUNCTION()));
                     ++file;
                 }