aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-01-17 14:07:17 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-02-03 21:18:08 -0200
commit3a33ef45bd90cc17b484cedddc8b2df3736e015a (patch)
tree981bc459b238bbc09d97351ceb1f9519e31aae47
parentEo: fix eo_shutdown()'s return value to be FALSE on shutdown. (diff)
downloadefl-3a33ef45bd90cc17b484cedddc8b2df3736e015a.tar.gz
eina-cxx: Fix instantiating eina domain without eina_init
Added eina_init to eina_domain initialization as to force eina_init to happen before initialization of global eina domains. This fixes eolian_js domain in src/bin/eolian_js.
-rw-r--r--src/bindings/eina_cxx/eina_log.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bindings/eina_cxx/eina_log.hh b/src/bindings/eina_cxx/eina_log.hh
index 77e30e56f1..5ec07446ea 100644
--- a/src/bindings/eina_cxx/eina_log.hh
+++ b/src/bindings/eina_cxx/eina_log.hh
@@ -148,7 +148,7 @@ struct log_domain : _domain_base<log_domain>
* @param color Color of the domain name.
*/
log_domain(char const* name, char const* color = "black")
- : _domain( ::eina_log_domain_register(name, color))
+ : _domain( (::eina_init(), ::eina_log_domain_register(name, color)) )
{
}
@@ -158,6 +158,7 @@ struct log_domain : _domain_base<log_domain>
~log_domain()
{
::eina_log_domain_unregister(_domain);
+ ::eina_shutdown();
}
int domain_raw() const { return _domain; }
private: