diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2016-11-11 11:06:26 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2016-11-11 11:09:05 +0100 |
| commit | cef418ab6cb2ef2b8ff2ff6a892587bc82682054 (patch) | |
| tree | 86a94bcd88c560fdee0e15b3ed35ee628a5073c3 | |
| parent | 509c9a37303f28fee5fa8261f92a0b553340e9d7 (diff) | |
Use libsigc++-3.0 instead of libsigc++-2.0
| -rw-r--r-- | cairomm/surface.h | 6 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cairomm/surface.h b/cairomm/surface.h index 865fc8e..ce3ba26 100644 --- a/cairomm/surface.h +++ b/cairomm/surface.h @@ -92,7 +92,7 @@ public: * @param length the amount of data to write * @return the status code of the write operation */ - typedef sigc::slot<ErrorStatus, const unsigned char* /*data*/, unsigned int /*length*/> SlotWriteFunc; + typedef sigc::slot<ErrorStatus(const unsigned char* /*data*/, unsigned int /*length*/)> SlotWriteFunc; /** * This is the type of function which is called when a backend needs to read @@ -105,7 +105,7 @@ public: * @param length the amount of data to read * @return the status code of the read operation */ - typedef sigc::slot<ErrorStatus, unsigned char* /*data*/, unsigned int /*length*/> SlotReadFunc; + typedef sigc::slot<ErrorStatus(unsigned char* /*data*/, unsigned int /*length*/)> SlotReadFunc; /** Create a C++ wrapper for the C instance. This C++ instance should then be * given to a RefPtr. @@ -137,7 +137,7 @@ public: /** For instance, * void on_destroy(); */ - typedef sigc::slot<void> SlotDestroy; + typedef sigc::slot<void()> SlotDestroy; /** Attach an image in the format mime_type to surface. To remove the data from * a surface, call unset_mime_data() with same mime type. diff --git a/configure.ac b/configure.ac index 844ed9e..a679cc4 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL PKG_PROG_PKG_CONFIG -AC_SUBST([CAIROMM_MODULES], ['cairo >= 1.10.0 sigc++-2.0 >= 2.5.1']) +AC_SUBST([CAIROMM_MODULES], ['cairo >= 1.10.0 sigc++-3.0 >= 2.5.1']) cairomm_allmodules=$CAIROMM_MODULES CAIROMM_INSTALL_PC='data/cairomm-1.14.pc' @@ -62,7 +62,7 @@ PKG_CHECK_MODULES([CAIROMM], [$cairomm_allmodules]) MM_ARG_ENABLE_DOCUMENTATION MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++]) -MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0]) +MM_ARG_WITH_TAGFILE_DOC([libsigc++-3.0.tag], [sigc++-3.0]) AC_LANG([C++]) MM_ARG_ENABLE_WARNINGS([CAIROMM_WXXFLAGS], |