From 21042dd515412fd47b96358dd3f859d0b8ce6cc2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 12 Nov 2011 23:20:42 +0000 Subject: [PATCH] + fix build errors with VS2010 git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5122 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/zipios++/dircoll.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/zipios++/dircoll.cpp b/src/zipios++/dircoll.cpp index 1c6243da9..5b086f70b 100644 --- a/src/zipios++/dircoll.cpp +++ b/src/zipios++/dircoll.cpp @@ -134,13 +134,21 @@ void DirectoryCollection::load( bool recursive, const FilePath &subdir ) { if ( *it == "." || *it == ".." || *it == "..." ) continue ; +# if (defined(_MSC_VER) && (_MSC_VER >= 1800)) + if ( boost::filesystem::get< is_directory >( it ) && recursive ) { + load( recursive, subdir + *it ) ; + } else { + _entries.push_back( ent = new BasicEntry( subdir + *it, "", _filepath ) ) ; + ent->setSize( boost::filesystem::get< boost::filesystem::size >( it ) ) ; + } +#else if ( get< is_directory >( it ) && recursive ) { load( recursive, subdir + *it ) ; } else { _entries.push_back( ent = new BasicEntry( subdir + *it, "", _filepath ) ) ; ent->setSize( get< boost::filesystem::size >( it ) ) ; } - +#endif } }