Merge pull request #12 from cppit/master

pull from cppit

docs/install.md

@@ -2,9 +2,25 @@
 ## Installation guide ##
 Before installation, please install libclangmm, see [installation guide](http://github.com/cppit/libclangmm/blob/master/docs/install.md).
 
-## Debian/Ubuntu
+## Debian/Ubuntu 15
 ```sh
-sudo apt-get install pkg-config libboost-system-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev
+sudo apt-get install pkg-config libboost-system-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev git
+```
+```sh
+git clone http://github.com/cppit/jucipp.git
+cd jucipp
+cmake .
+make
+sudo make install
+```
+
+## Ubuntu 14/Linux Mint 17
+```sh
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+sudo apt-get update
+sudo apt-get install g++-4.9
+sudo apt-get remove g++-4.8
+sudo apt-get install pkg-config libboost-system1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-log1.55-dev libgtkmm-3.0-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev git
 ```
 ```sh
 git clone http://github.com/cppit/jucipp.git
@@ -16,7 +32,7 @@ sudo make install
 
 ## OS X with Homebrew (http://brew.sh/)
 ```sh
-brew install pkg-config boost gtkmm3 gtksourceviewmm3 aspell
+brew install pkg-config boost gtkmm3 homebrew/x11/gtksourceviewmm3 aspell git
 ```
 
 ```sh
@@ -30,7 +46,7 @@ make install
 ##Windows with MSYS2 (https://msys2.github.io/)
 Install dependencies(replace [arch] with i686 or x86_64 depending on your MSYS2 install):
 ```sh
-pacman -S patch autoconf automake-wrapper mingw-w64-[arch]-gtkmm3 mingw-w64-[arch]-boost mingw-w64-[arch]-aspell mingw-w64-[arch]-aspell-en
+pacman -S patch autoconf automake-wrapper mingw-w64-[arch]-gtkmm3 mingw-w64-[arch]-boost mingw-w64-[arch]-aspell mingw-w64-[arch]-aspell-en git
 ```
 
 Get juCi++ source:

src/directories.cc

@@ -9,6 +9,7 @@
 using namespace std; //TODO: remove
 
 namespace sigc {
+#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
   struct functor_trait<Functor, false> {
     typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
@@ -16,6 +17,9 @@ namespace sigc {
     typedef typename _intermediate::result_type result_type;
     typedef Functor functor_type;
   };
+#else
+  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+#endif
 }
 
 Directories::Directories() : stop_update_thread(false) {

src/entrybox.cc

@@ -1,6 +1,7 @@
 #include "entrybox.h"
 
 namespace sigc {
+#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
   struct functor_trait<Functor, false> {
     typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
@@ -8,6 +9,9 @@ namespace sigc {
     typedef typename _intermediate::result_type result_type;
     typedef Functor functor_type;
   };
+#else
+  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+#endif
 }
 
 std::unordered_map<std::string, std::vector<std::string> > EntryBox::entry_histories;

src/notebook.cc

@@ -10,6 +10,7 @@
 using namespace std; //TODO: remove
 
 namespace sigc {
+#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
   struct functor_trait<Functor, false> {
     typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
@@ -17,6 +18,9 @@ namespace sigc {
     typedef typename _intermediate::result_type result_type;
     typedef Functor functor_type;
   };
+#else
+  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+#endif
 }
 
 Notebook::Notebook(Directories &directories) : Gtk::Notebook(), directories(directories) {

src/selectiondialog.cc

@@ -2,6 +2,7 @@
 #include <algorithm>
 
 namespace sigc {
+#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
   struct functor_trait<Functor, false> {
     typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
@@ -9,6 +10,9 @@ namespace sigc {
     typedef typename _intermediate::result_type result_type;
     typedef Functor functor_type;
   };
+#else
+  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+#endif
 }
 
 SelectionDialogBase::SelectionDialogBase(Gtk::TextView& text_view, Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark, bool show_search_entry): text_view(text_view), 

src/source.cc

@@ -12,6 +12,7 @@
 using namespace std; //TODO: remove
 
 namespace sigc {
+#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
   struct functor_trait<Functor, false> {
     typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
@@ -19,6 +20,9 @@ namespace sigc {
     typedef typename _intermediate::result_type result_type;
     typedef Functor functor_type;
   };
+#else
+  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+#endif
 }
 
 Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path &file_path) {

src/tooltips.cc

@@ -5,6 +5,7 @@
 using namespace std;
 
 namespace sigc {
+#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
   struct functor_trait<Functor, false> {
     typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
@@ -12,6 +13,9 @@ namespace sigc {
     typedef typename _intermediate::result_type result_type;
     typedef Functor functor_type;
   };
+#else
+  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+#endif
 }
 
 Gdk::Rectangle Tooltips::drawn_tooltips_rectangle=Gdk::Rectangle();

src/window.cc

@@ -10,6 +10,7 @@
 using namespace std; //TODO: remove
 
 namespace sigc {
+#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
   struct functor_trait<Functor, false> {
     typedef decltype (::sigc::mem_fun(std::declval<Functor&>(),
@@ -17,6 +18,9 @@ namespace sigc {
     typedef typename _intermediate::result_type result_type;
     typedef Functor functor_type;
   };
+#else
+  SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
+#endif
 }
 
 void Window::generate_keybindings() {