From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.5 Date: Thu, 6 Sep 2012 19:28:05 +0400 From: "Ivan A. Melnikov" To: devel@lists.altlinux.org Message-ID: <20120906192805.37a240f1@deimos.localdomain> In-Reply-To: <50489B11.408@kemsu.ru> References: <20120905080503.0135b097@deimos.localdomain> <50489B11.408@kemsu.ru> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.11; x86_64-alt-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/2ico/zINRzInxp4gmDHwEs/" Cc: dubrsl@altlinux.org 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, 06 Sep 2012 15:34:32 -0000 Archived-At: List-Archive: List-Post: --MP_/2ico/zINRzInxp4gmDHwEs/ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thu, 06 Sep 2012 19:46:09 +0700 REAL wrote: > 05.09.2012 11:05, Ivan A. Melnikov =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > =3D=3D =D0=97=D0=B0=D0=BC=D0=B5=D1=87=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5 =D0= =BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D1=8B =D0=BF=D0=B5=D1=80=D0=B5=D1= =81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8 =3D=3D >=20 > =D0=BF=D1=80=D0=BE=D1=88=D1=83 =D0=BF=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80= =D0=B5=D1=82=D1=8C =D0=BD=D0=B0 bombono-dvd, =D1=82=D0=B0=D0=BC =D0=BF=D1= =80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D1=8B, =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1= =8B=D0=B5 =D0=B7=D0=B4=D0=B5=D1=81=D1=8C =D0=B5=D1=89=D1=91 =D0=BD=D0=B5=20 > =D0=BE=D1=81=D0=B2=D0=B5=D1=89=D0=B5=D0=BD=D1=8B (=D0=B2 =D1=87=D0=B0=D1= =81=D1=82=D0=BD=D0=BE=D1=81=D1=82=D0=B8, =D0=BD=D0=B5=D0=B2=D0=BE=D0=B7=D0= =BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C =D0=B8=D1=81=D0=BF=D0=BE=D0= =BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20 > boost::filesystem::path =D0=BA=D0=B0=D0=BA =D0=BF=D0=B0=D1=80=D0=B0=D0=BC= =D0=B5=D1=82=D1=80=D0=B0 =D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8 std::ve= ctor::push_back). >=20 =D0=9F=D0=B0=D1=82=D1=87 =D0=BF=D1=80=D0=B8=D0=BB=D0=B0=D0=B3=D0=B0=D0=B5= =D1=82=D1=81=D1=8F. =D0=91=D1=8B=D0=BB=D0=BE =D0=B1=D1=8B =D0=B7=D0=B4=D0= =BE=D1=80=D0=BE=D0=B2=D0=BE =D0=B5=D1=81=D0=BB=D0=B8 =D0=B1=D1=8B =D0=BC=D0= =B0=D0=B9=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80 =D0=BF=D1=80=D0=B8=D0= =BB=D0=BE=D0=B6=D0=B8=D0=BB =D0=B5=D0=B3=D0=BE =D1=81=D0=B0=D0=BC (=D0=BD=D0=B5 =D0=BE=D1=87=D0=B5=D0=BD=D1=8C =D0=BB=D1=8E=D0=B1=D0=BB=D1=8E= =D1=81 =D1=82=D0=B0=D0=BA=D0=B8=D0=BC=D0=B8 =D1=80=D0=B5=D0=BF=D0=BE=D0=B7= =D0=B8=D1=82=D0=BE=D1=80=D0=B8=D1=8F=D0=BC=D0=B8 =D1=80=D0=B0=D0=B1=D0=BE= =D1=82=D0=B0=D1=82=D1=8C), =D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8=D0=BB =D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BE=D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0= =BD=D0=BE=D1=81=D1=82=D1=8C =D0=B8 =D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BB=D1= =81=D1=8F =D1=81 =D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=BE=D0=BC. --=20 WBR, Ivan A. Melnikov --MP_/2ico/zINRzInxp4gmDHwEs/ Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=bombono-dvd-1.2.1-alt-boost-filesystem-v3.patch Diff --git a/libs/boost-lib/boost/filesystem/v2/fstream.hpp b/libs/boost-li= b/boost/filesystem/v2/fstream.hpp index bdcd485..101ed30 100644 --- a/libs/boost-lib/boost/filesystem/v2/fstream.hpp +++ b/libs/boost-lib/boost/filesystem/v2/fstream.hpp @@ -488,27 +488,27 @@ namespace boost std::ios_base::openmode mode ) { return std::basic_filebuf::open( - file_ph.file_string().c_str(), mode ) =3D=3D 0 ? 0 : this; + file_ph.string().c_str(), mode ) =3D=3D 0 ? 0 : this; } # endif =20 template basic_ifstream::basic_ifstream( const path & file_ph ) : std::basic_ifstream( - file_ph.file_string().c_str(), std::ios_base::in ) {} + file_ph.string().c_str(), std::ios_base::in ) {} =20 template basic_ifstream::basic_ifstream( const path & file_ph, std::ios_base::openmode mode ) : std::basic_ifstream( - file_ph.file_string().c_str(), mode ) {} + file_ph.string().c_str(), mode ) {} =20 # if !BOOST_WORKAROUND( BOOST_MSVC, <=3D 1200 ) // VC++ 6.0 can't handle= this template void basic_ifstream::open( const path & file_ph ) { std::basic_ifstream::open( - file_ph.file_string().c_str(), std::ios_base::in ); + file_ph.string().c_str(), std::ios_base::in ); } =20 template @@ -516,27 +516,27 @@ namespace boost std::ios_base::openmode mode ) { std::basic_ifstream::open( - file_ph.file_string().c_str(), mode ); + file_ph.string().c_str(), mode ); } # endif =20 template basic_ofstream::basic_ofstream( const path & file_ph ) : std::basic_ofstream( - file_ph.file_string().c_str(), std::ios_base::out ) {} + file_ph.string().c_str(), std::ios_base::out ) {} =20 template basic_ofstream::basic_ofstream( const path & file_ph, std::ios_base::openmode mode ) : std::basic_ofstream( - file_ph.file_string().c_str(), mode ) {} + file_ph.string().c_str(), mode ) {} =20 # if !BOOST_WORKAROUND( BOOST_MSVC, <=3D 1200 ) // VC++ 6.0 can't handle= this template void basic_ofstream::open( const path & file_ph ) { std::basic_ofstream::open( - file_ph.file_string().c_str(), std::ios_base::out ); + file_ph.string().c_str(), std::ios_base::out ); } =20 template @@ -544,14 +544,14 @@ namespace boost std::ios_base::openmode mode ) { std::basic_ofstream::open( - file_ph.file_string().c_str(), mode ); + file_ph.string().c_str(), mode ); } # endif =20 template basic_fstream::basic_fstream( const path & file_ph ) : std::basic_fstream( - file_ph.file_string().c_str(), + file_ph.string().c_str(), std::ios_base::in|std::ios_base::out ) {} =20 =20 @@ -559,14 +559,14 @@ namespace boost basic_fstream::basic_fstream( const path & file_ph, std::ios_base::openmode mode ) : std::basic_fstream( - file_ph.file_string().c_str(), mode ) {} + file_ph.string().c_str(), mode ) {} =20 # if !BOOST_WORKAROUND( BOOST_MSVC, <=3D 1200 ) // VC++ 6.0 can't handle= this template void basic_fstream::open( const path & file_ph ) { std::basic_fstream::open( - file_ph.file_string().c_str(), std::ios_base::in|std::ios_base::ou= t ); + file_ph.string().c_str(), std::ios_base::in|std::ios_base::out ); } =20 template @@ -574,7 +574,7 @@ namespace boost std::ios_base::openmode mode ) { std::basic_fstream::open( - file_ph.file_string().c_str(), mode ); + file_ph.string().c_str(), mode ); } # endif } // namespace filesystem2 diff --git a/libs/boost-lib/boost/filesystem/v2/operations.hpp b/libs/boost= -lib/boost/filesystem/v2/operations.hpp index 9bd35cd..ad08cc3 100644 --- a/libs/boost-lib/boost/filesystem/v2/operations.hpp +++ b/libs/boost-lib/boost/filesystem/v2/operations.hpp @@ -1081,7 +1081,7 @@ namespace boost { return path().filename(); } - typename Path::string_type leaf() const + typename Path::string_type filename().string() const { return path().filename(); } diff --git a/libs/boost-lib/boost/filesystem/v2/path.hpp b/libs/boost-lib/b= oost/filesystem/v2/path.hpp index d159c37..580b635 100644 --- a/libs/boost-lib/boost/filesystem/v2/path.hpp +++ b/libs/boost-lib/boost/filesystem/v2/path.hpp @@ -232,11 +232,11 @@ namespace boost =20 // observers const string_type & string() const { return m_path; } - const string_type file_string() const; - const string_type directory_string() const { return file_string(); } + const string_type string() const; + const string_type string() const { return string(); } =20 - const external_string_type external_file_string() const { return Tra= its::to_external( *this, file_string() ); } - const external_string_type external_directory_string() const { retur= n Traits::to_external( *this, directory_string() ); } + const external_string_type external_file_string() const { return Tra= its::to_external( *this, string() ); } + const external_string_type external_directory_string() const { retur= n Traits::to_external( *this, string() ); } =20 basic_path root_path() const; string_type root_name() const; @@ -248,7 +248,7 @@ namespace boost string_type extension() const; =20 # ifndef BOOST_FILESYSTEM_NO_DEPRECATED - string_type leaf() const { return filename(); } + string_type filename().string() const { return filename(= ); } basic_path branch_path() const { return parent_path(); } bool has_leaf() const { return !m_path.empty(); } bool has_branch_path() const { return !parent_path().empty()= ; } @@ -309,8 +309,8 @@ namespace boost // are only minor differences between generic and native path gramma= rs. // Private members might be quite different in other implementations, // particularly where there were wide differences between portable a= nd - // native path formats, or between file_string() and - // directory_string() formats, or simply that the implementation + // native path formats, or between string() and + // string() formats, or simply that the implementation // was willing expend additional memory to achieve greater speed for // some operations at the expense of other operations. =20 @@ -338,8 +338,8 @@ namespace boost basic_path( const string_type & str, name_check ) { operator/=3D( st= r ); } basic_path( const typename string_type::value_type * s, name_check ) { operator/=3D( s );} - string_type native_file_string() const { return file_string(); } - string_type native_directory_string() const { return directory_strin= g(); } + string_type native_file_string() const { return string(); } + string_type native_directory_string() const { return string(); } static bool default_name_check_writable() { return false; }=20 static void default_name_check( name_check ) {} static name_check default_name_check() { return 0; } @@ -647,13 +647,13 @@ namespace boost if ( !path1_arg.empty() ) { target +=3D ": \""; - target +=3D path1_arg.file_string(); + target +=3D path1_arg.string(); target +=3D "\""; } if ( !path2_arg.empty() ) { target +=3D ", \""; - target +=3D path2_arg.file_string(); + target +=3D path2_arg.string(); target +=3D "\""; } } @@ -1294,7 +1294,7 @@ namespace boost =20 template const String - basic_path::file_string() const + basic_path::string() const { # ifdef BOOST_WINDOWS_PATH // for Windows, use the alternate separator, and bypass extra=20 diff --git a/libs/boost-lib/boost/filesystem/v3/path.hpp b/libs/boost-lib/b= oost/filesystem/v3/path.hpp index 0caa19f..fe3c975 100644 --- a/libs/boost-lib/boost/filesystem/v3/path.hpp +++ b/libs/boost-lib/boost/filesystem/v3/path.hpp @@ -389,7 +389,7 @@ namespace filesystem3 // recently deprecated functions supplied by default path& normalize() { return m_normalize(); } path& remove_leaf() { return remove_filename(); } - path leaf() const { return filename(); } + path filename().string() const { return filename(); } path branch_path() const { return parent_path(); } bool has_leaf() const { return !m_pathname.empty(); } bool has_branch_path() const { return !parent_path().empty(); } @@ -399,8 +399,8 @@ namespace filesystem3 # if defined(BOOST_FILESYSTEM_DEPRECATED) // deprecated functions with enough signature or semantic changes tha= t they are // not supplied by default=20 - const std::string file_string() const { return string();= } - const std::string directory_string() const { return string();= } + const std::string string() const { return string(); } + const std::string string() const { return string(); } const std::string native_file_string() const { return string();= } const std::string native_directory_string() const { return string();= } const string_type external_file_string() const { return native();= } diff --git a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp b/libs/boost= -lib/libs/filesystem/v2/src/v2_path.cpp index 7adeaff..4fc0343 100644 --- a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp +++ b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp @@ -107,13 +107,13 @@ namespace boost // if ( !path1.empty() ) // { // target +=3D ": \""; - // target +=3D path1.file_string(); + // target +=3D path1.string(); // target +=3D "\""; // } // if ( !path2.empty() ) // { // target +=3D ", \""; - // target +=3D path2.file_string(); + // target +=3D path2.string(); // target +=3D "\""; // } // } diff --git a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hp= p b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp index 7b0aa71..a4a6f28 100644 --- a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp +++ b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp @@ -166,7 +166,7 @@ private: } =20 boost::xtime to_wait; - xtime_get(&to_wait, boost::TIME_UTC); + xtime_get(&to_wait, boost::TIME_UTC_); to_wait.sec +=3D sleep_ms / 1000; to_wait.nsec +=3D (sleep_ms % 1000) * (NANOSECONDS_PER_SECOND = / 1000); to_wait.sec +=3D to_wait.nsec / NANOSECONDS_PER_SECOND ; diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one= _filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_on= e_filter.cpp index 1d934da..d45beb4 100644 --- a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter= .cpp +++ b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter= .cpp @@ -103,7 +103,7 @@ BOOST_DEFINE_LOG(g_l, log_type) void do_sleep(int ms) { using namespace boost; xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec +=3D (ms % 1000) * 1000000; =20 int nano_per_sec =3D 1000000000; diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_= filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_= filter.cpp index 9746319..4b9f845 100644 --- a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.= cpp +++ b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.= cpp @@ -95,7 +95,7 @@ BOOST_DEFINE_LOG(g_l, log_type) void do_sleep(int ms) { using namespace boost; xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec +=3D (ms % 1000) * 1000000; =20 int nano_per_sec =3D 1000000000; diff --git a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario= .cpp b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp index d447f24..f5ad955 100644 --- a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp +++ b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp @@ -124,7 +124,7 @@ BOOST_DEFINE_LOG(g_log_dbg, finder::logger ) void do_sleep(int ms) { using namespace boost; xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec +=3D (ms % 1000) * 1000000; =20 int nano_per_sec =3D 1000000000; diff --git a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simp= le_tss.cpp b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simp= le_tss.cpp index 627618e..205d07a 100644 --- a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.= cpp +++ b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.= cpp @@ -75,7 +75,7 @@ using namespace logging; =20 void do_sleep(int ms) { xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec +=3D (ms % 1000) * 1000000; =20 int nano_per_sec =3D 1000000000; diff --git a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cach= e/test_ts_resource.cpp b/libs/boost-logging/lib/logging/tests/test_ts_resou= ce_with_cache/test_ts_resource.cpp index 0bee896..2217c12 100644 --- a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_= ts_resource.cpp +++ b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_= ts_resource.cpp @@ -167,7 +167,7 @@ void test_resource(int idx) { =20 void do_sleep(int ms) { xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec +=3D (ms % 1000) * 1000000; =20 int nano_per_sec =3D 1000000000; @@ -262,7 +262,7 @@ int g_run_period_secs =3D 200; =20 int main() { - xtime_get( &g_start, TIME_UTC); + xtime_get( &g_start, TIME_UTC_); =20 for ( int i =3D 0; i < g_update_thread_count; ++i) thread t(&update_thread); diff --git a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects= .cpp b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp index b8e1ba6..14c8281 100644 --- a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp +++ b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp @@ -98,7 +98,7 @@ private: =20 void do_sleep(int ms) { xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec +=3D (ms % 1000) * 1000000; =20 int nano_per_sec =3D 1000000000; diff --git a/src/mbase/project/table.cpp b/src/mbase/project/table.cpp index 33ee15a..feb851a 100644 --- a/src/mbase/project/table.cpp +++ b/src/mbase/project/table.cpp @@ -427,7 +427,7 @@ void GetThemeList(Str::List& t_lst) { for( fs::directory_iterator itr(dir), end; itr !=3D end; ++itr= ) if( IsFrameDir(*itr) ) - t_lst.push_back(itr->leaf()); + t_lst.push_back(itr->path().filename().string()); } } =20 diff --git a/src/mgui/author/script.cpp b/src/mgui/author/script.cpp index 97df6d4..aba4fa1 100644 --- a/src/mgui/author/script.cpp +++ b/src/mgui/author/script.cpp @@ -370,7 +370,7 @@ static std::string SrcFilename(VideoItem vi) static std::string PrefixCnvPath(VideoItem vi, const std::string& out_dir) { std::string dst_fname =3D boost::format("%1%.%2%") % GetAuthorNumber(v= i)=20 - % fs::path(SrcFilename(vi)).leaf() % bf::stop; + % fs::path(SrcFilename(vi)).filename().string() % bf::stop; return AppendPath(out_dir, dst_fname); } =20 diff --git a/src/mgui/editor/toolbar.cpp b/src/mgui/editor/toolbar.cpp index e549490..c6f15b3 100644 --- a/src/mgui/editor/toolbar.cpp +++ b/src/mgui/editor/toolbar.cpp @@ -287,7 +287,7 @@ Toolbar::Toolbar(): selTool(MakeSelectionToolImage()), = txtTool(MakeTextToolLabel if( fs::is_directory(dir) ) { =20 boost_foreach( const fs::path& pth, dir_range(dir) ) - o_lst.push_back(pth.filename()); + o_lst.push_back(pth.filename().string()); } } std::sort(o_lst.begin(), o_lst.end(), &ByExtName); diff --git a/src/mgui/mux.cpp b/src/mgui/mux.cpp index 4b4a5fa..0864bc2 100644 --- a/src/mgui/mux.cpp +++ b/src/mgui/mux.cpp @@ -72,7 +72,7 @@ void SetDialogStrict(Gtk::Dialog& dlg, int min_wdh, int m= in_hgt, bool set_resiza =20 static bool RunMuxing(const std::string& dest_path, const std::string& arg= s) { - Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).leaf() % b= f::stop); + Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).filename()= .string() % bf::stop); SetDialogStrict(dlg, 400, -1); =20 Gtk::TextView& txt_view =3D NewManaged(); diff --git a/src/mgui/project/add.cpp b/src/mgui/project/add.cpp index db4df17..0425a9b 100644 --- a/src/mgui/project/add.cpp +++ b/src/mgui/project/add.cpp @@ -420,7 +420,7 @@ void TryAddMediaQuiet(const std::string& fname, const s= td::string& desc) static std::string StandFNameOut(const fs::path& pth) { return "" +=20 - pth.leaf() + ""; + pth.filename().string() + ""; } =20 #if GTK_CHECK_VERSION(2,18,0) @@ -454,7 +454,7 @@ StorageItem CheckExists(const fs::path& pth, RefPtr ms) =20 void OneMediaError(const fs::path& err_pth, const std::string& desc) { - AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.leaf() % bf::st= op, desc); + AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.filename().stri= ng() % bf::stop, desc); } =20 void TryAddMedias(const Str::List& paths, MediaBrowser& brw, @@ -465,7 +465,7 @@ void TryAddMedias(const Str::List& paths, MediaBrowser&= brw, { const std::string fname =3D paths[0]; fs::path pth(fname);=20 - std::string leaf =3D pth.leaf(); + std::string leaf =3D pth.filename().string(); { static re::pattern dvd_video_vob("(VIDEO_TS|VTS_[0-9][0-9]_[0-= 9]).VOB",=20 re::pattern::perl|re::patter= n::icase); diff --git a/src/mgui/project/mconstructor.cpp b/src/mgui/project/mconstruc= tor.cpp index 12e2f49..7ad2546 100644 --- a/src/mgui/project/mconstructor.cpp +++ b/src/mgui/project/mconstructor.cpp @@ -961,7 +961,7 @@ void RunConstructor(const std::string& prj_file_name, b= ool ask_save_on_exit) static const fs::directory_iterator end_itr; for( fs::directory_iterator itr(DataDirPath("bmd-icons")); itr !=3D end_itr; ++itr ) - pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->string())= ); + pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->path().st= ring())); Gtk::Window::set_default_icon_list(pix_lst); =20 ActionFunctor after_fnr =3D BuildConstructor(app, prj_file_name); diff --git a/src/mgui/project/serialize.cpp b/src/mgui/project/serialize.cpp index 12b3c3a..2340b0b 100644 --- a/src/mgui/project/serialize.cpp +++ b/src/mgui/project/serialize.cpp @@ -71,7 +71,7 @@ static std::string MakeProjectTitle(bool with_path_breakd= own =3D false) return "untitled.bmd"; =20 fs::path full_path(db.GetProjectFName()); - std::string res_str =3D full_path.leaf(); + std::string res_str =3D full_path.filename().string(); if( with_path_breakdown ) res_str +=3D " (" + full_path.branch_path().string() + ")"; return res_str; diff --git a/src/mgui/win_utils.cpp b/src/mgui/win_utils.cpp index 28ad9dd..175e241 100644 --- a/src/mgui/win_utils.cpp +++ b/src/mgui/win_utils.cpp @@ -418,7 +418,7 @@ bool CheckKeepOrigin(const std::string& fname) bool res =3D false; if( fs::exists(fname) &&=20 (Gtk::RESPONSE_OK !=3D MessageBox(BF_("A file named \"%1%\" alread= y exists. Do you want to replace it?") - % fs::path(fname).leaf() % bf::sto= p, + % fs::path(fname).filename().strin= g() % bf::stop, Gtk::MESSAGE_QUESTION, Gtk::BUTTON= S_OK_CANCEL,=20 _("Replacing the file overwrite it= s contents."), true)) ) diff --git a/src/mlib/filesystem.cpp b/src/mlib/filesystem.cpp index bb84860..5d4f39c 100644 --- a/src/mlib/filesystem.cpp +++ b/src/mlib/filesystem.cpp @@ -47,7 +47,7 @@ const char* FindExtDot(const char* name) =20 std::string get_basename(const fs::path& pth) { - std::string name_s =3D pth.leaf(); + std::string name_s =3D pth.filename().string(); const char* name =3D name_s.c_str(); =20 //if( const char* dot =3D strstr(name, ".") ) @@ -58,24 +58,13 @@ std::string get_basename(const fs::path& pth) =20 std::string get_extension(const fs::path& pth) { - std::string name_s =3D pth.leaf(); + std::string name_s =3D pth.filename().string(); =20 if( const char* dot =3D FindExtDot(name_s.c_str()) ) return std::string(dot+1); return std::string(); } =20 -// =D0=B3=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F =D1=83=D1= =81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B0 =D0=BF=D1=80=D0=BE=D0=B2=D0= =B5=D1=80=D0=BA=D0=B8 =D0=B8=D0=BC=D0=B5=D0=BD =D1=84=D0=B0=D0=B9=D0=BB=D0= =BE=D0=B2 -class tune_boost_filesystem -{ - public: - tune_boost_filesystem() - { - // =D1=87=D1=82=D0=BE=D0=B1 =D0=BB=D1=8E=D0=B1=D1=8B=D0=B5 =D1=81= =D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D1=8B =D0=B2 =D0=B8=D0=BC=D0=B5=D0=BD=D0=B0= =D1=85 =D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2 =D0=BF=D0=BE=D0=B7=D0=B2=D0=BE= =D0=BB=D1=8F=D0=BB=D0=B8=D1=81=D1=8C, =D0=B4=D0=BB=D1=8F utf8 - fs::path::default_name_check(fs::native); - } -} tune_boost_filesystem_obj; - namespace Project { =20 --MP_/2ico/zINRzInxp4gmDHwEs/--