sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net-im/ekiga: unbreak build with Clang 6 (C++14 by default)

Browse source 
In file included from ../lib/engine/videoinput/videoinput-core.cpp:44:
In file included from ../lib/engine/videoinput/videoinput-core.h:40:
In file included from ../lib/engine/framework/services.h:48:
In file included from /usr/local/include/boost/signals.hpp:9:
In file included from /usr/local/include/boost/signal.hpp:27:
In file included from /usr/local/include/boost/signals/signal0.hpp:24:
In file included from /usr/local/include/boost/signals/signal_template.hpp:37:
In file included from /usr/local/include/boost/function/function0.hpp:11:
In file included from /usr/local/include/boost/function/detail/maybe_include.hpp:13:
/usr/local/include/boost/function/function_template.hpp:159:33: error: called object type 'nullptr_t' is not a function or function pointer
          BOOST_FUNCTION_RETURN((*f)(BOOST_FUNCTION_ARGS));
                                ^~~~
/usr/local/include/boost/function/function_template.hpp:81:36: note: expanded from macro 'BOOST_FUNCTION_RETURN'
 #  define BOOST_FUNCTION_RETURN(X) X
                                    ^
/usr/local/include/boost/function/function_template.hpp:925:53: note: in instantiation of member function 'boost::detail::function::void_function_obj_invoker0<nullptr_t, void>::invoke' requested here
        { { &manager_type::manage }, &invoker_type::invoke };
                                                    ^
/usr/local/include/boost/function/function_template.hpp:716:13: note: in instantiation of function template specialization 'boost::function0<void>::assign_to<nullptr_t>' requested here
      this->assign_to(f);
            ^
../lib/engine/notification/notification-core.h:59:61: note: in instantiation of function template specialization 'boost::function0<void>::function0<nullptr_t>' requested here
                  boost::function0<void> action_callback_ = NULL)
                                                            ^
/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
 #define NULL    nullptr
                 ^

Reported by:	antoine (via bug 224669)
This commit is contained in:
Jan Beich 2018-01-08 17:07:21 +00:00
parent cb2f1e01ba
commit 1d02ed4ffc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=458455
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
net-im/ekiga/files/patch-lib_engine_notification_notification-core.h Normal file
View file

@ -0,0 +1,39 @@
In file included from ../lib/engine/videoinput/videoinput-core.cpp:44:
In file included from ../lib/engine/videoinput/videoinput-core.h:40:
In file included from ../lib/engine/framework/services.h:48:
In file included from /usr/local/include/boost/signals.hpp:9:
In file included from /usr/local/include/boost/signal.hpp:27:
In file included from /usr/local/include/boost/signals/signal0.hpp:24:
In file included from /usr/local/include/boost/signals/signal_template.hpp:37:
In file included from /usr/local/include/boost/function/function0.hpp:11:
In file included from /usr/local/include/boost/function/detail/maybe_include.hpp:13:
/usr/local/include/boost/function/function_template.hpp:159:33: error: called object type 'nullptr_t' is not a function or function pointer
BOOST_FUNCTION_RETURN((*f)(BOOST_FUNCTION_ARGS));
^~~~
/usr/local/include/boost/function/function_template.hpp:81:36: note: expanded from macro 'BOOST_FUNCTION_RETURN'
# define BOOST_FUNCTION_RETURN(X) X
^
/usr/local/include/boost/function/function_template.hpp:925:53: note: in instantiation of member function 'boost::detail::function::void_function_obj_invoker0<nullptr_t, void>::invoke' requested here
{ { &manager_type::manage }, &invoker_type::invoke };
^
/usr/local/include/boost/function/function_template.hpp:716:13: note: in instantiation of function template specialization 'boost::function0<void>::assign_to<nullptr_t>' requested here
this->assign_to(f);
^
../lib/engine/notification/notification-core.h:59:61: note: in instantiation of function template specialization 'boost::function0<void>::function0<nullptr_t>' requested here
boost::function0<void> action_callback_ = NULL)
^
/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
#define NULL nullptr
^
--- lib/engine/notification/notification-core.h.orig 2012-11-07 20:43:51 UTC
+++ lib/engine/notification/notification-core.h
@@ -56,7 +56,7 @@ namespace Ekiga
const std::string title_,
const std::string body_,
const std::string action_name_ = "",
- boost::function0<void> action_callback_ = NULL)
+ boost::function0<void> action_callback_ = 0)
: level(level_), title(title_), body(body_), action_name(action_name_), action_callback(action_callback_)
{}