Changeset 9707 for code/branches

Timestamp:

Oct 21, 2013, 2:50:20 PM (11 years ago)

Author:

georgr

Message:

merged newest trunk stuff, should compile on ubuntu now

Location:

code/branches/wiimote

Files:

• . (modified) (1 prop)
• src/libraries/core/CorePrereqs.h (modified) (2 diffs)

code/branches/wiimote/src/libraries/core/CorePrereqs.h

@@ -276 +276 @@
     }
 
-#elif (BOOST_VERSION < 104800)
+#elif (BOOST_VERSION < 105000)
 
 # if BOOST_FILESYSTEM_VERSION == 2
@@ -304 +304 @@
 #else
 
-    // TODO: Check this once boost 1.48 is released
     namespace filesystem
     {