From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Thu, 25 Oct 2012 15:41:45 +0400 From: "George V. Kouryachy" To: ALT Linux Team development discussions Message-ID: <20121025114145.GE31751@imap.altlinux.org> Mail-Followup-To: ALT Linux Team development discussions References: <20120905080503.0135b097@deimos.localdomain> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="+HP7ph2BbKc20aGI" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20120905080503.0135b097@deimos.localdomain> User-Agent: Mutt/1.4.2.3i Subject: Re: [devel] IA: boost 1.51.0 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2012 11:41:46 -0000 Archived-At: List-Archive: List-Post: --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit On Wed, Sep 05, 2012 at 08:05:03AM +0400, Ivan A. Melnikov wrote: > В Сизиф отправлен очередной свежий буст, на этот раз 1.51.0. Как обычно > есть compat-пакет, и я прошу сообщество пересобирать свои пакеты с > новой версией буста чтобы поскорее от этого compat-пакета избавиться. Мои пять копеек. Изменение функциональности direntry.filename() BTW, полезная ссылка по теме: http://www.boost.org/doc/libs/1_51_0/libs/filesystem/doc/deprecated.html -- George V. Kouryachy (aka Fr. Br. George) Mailto/JID: george@altlinux.org Mobile: (+7)9161738325 --+HP7ph2BbKc20aGI Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="violetland-v0.4.3-boost1.51.patch" diff -ur violetland-v0.4.3/CMakeLists.txt violetland-v0.4.3.new/CMakeLists.txt --- violetland-v0.4.3/CMakeLists.txt 2012-10-25 13:33:44.000000000 +0000 +++ violetland-v0.4.3.new/CMakeLists.txt 2012-10-25 10:04:16.835289639 +0000 @@ -8,7 +8,6 @@ find_package(SDL_mixer REQUIRED) find_package(OpenGL REQUIRED) find_package(Boost COMPONENTS filesystem system REQUIRED) -add_definitions(-DBOOST_FILESYSTEM_VERSION=2) if(${MINGW}) set(INTL_LIBRARY intl) diff -ur violetland-v0.4.3/src/system/utility/FileUtility.cpp violetland-v0.4.3.new/src/system/utility/FileUtility.cpp --- violetland-v0.4.3/src/system/utility/FileUtility.cpp 2012-10-25 13:33:44.000000000 +0000 +++ violetland-v0.4.3.new/src/system/utility/FileUtility.cpp 2012-10-25 10:40:04.986273041 +0000 @@ -20,7 +20,7 @@ while (dir_it != boost::filesystem::directory_iterator()) { if (boost::filesystem::is_regular_file(*dir_it)) - files.push_back(dir_it->filename()); + files.push_back(dir_it->path().filename().string()); ++dir_it; } return files; @@ -32,8 +32,8 @@ while (dir_it != boost::filesystem::directory_iterator()) { if (boost::filesystem::is_directory(*dir_it)) - if (dir_it->path().filename()[0] != '.') - subDirs.push_back(dir_it->path().filename()); + if (dir_it->path().filename().string()[0] != '.') + subDirs.push_back(dir_it->path().filename().string()); ++dir_it; } return subDirs; @@ -45,7 +45,7 @@ while (dir_it != boost::filesystem::directory_iterator()) { if (boost::filesystem::is_directory(*dir_it)) - if (dir_it->path().filename()[0] != '.') + if (dir_it->path().filename().string()[0] != '.') ++count; ++dir_it; } --+HP7ph2BbKc20aGI--