From 04fcdd40a001e75a7c497f6917745a6b83d02e66 Mon Sep 17 00:00:00 2001 From: Andrey Skvortsov Date: Thu, 7 Oct 2010 19:27:55 -0700 Subject: [PATCH] add missing GLIBMM_EXCEPTIONS_ENABLED preproc in main for compile --- rtgui/main.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rtgui/main.cc b/rtgui/main.cc index 6885e44fe..bc6c4a977 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -85,9 +85,15 @@ int main(int argc, char **argv) argv1_ = argv[1]; else argv1_ = ""; - - argv0 = Glib::filename_to_utf8 (argv0_); - argv1 = Glib::filename_to_utf8 (argv1_); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + argv0 = Glib::filename_to_utf8 (argv0); + argv1 = Glib::filename_to_utf8 (argv1); +#else + std::auto_ptr error; + argv0 = Glib::filename_to_utf8 (argv0_, error); + argv1 = Glib::filename_to_utf8 (argv1_, error); +#endif //GLIBMM_EXCEPTIONS_ENABLED Glib::thread_init(); gdk_threads_init();