[beast: 15/31] SFI: fix compiler warnings

[Tim Janik <timj src gnome org>]

commit 6713a299dab27e5531d6cd92f443a5e1d6121131
Author: Tim Janik <timj gnu org>
Date:   Fri Jun 12 18:26:10 2015 +0200

    SFI: fix compiler warnings

 sfi/sfidl-cxxbase.cc |    2 ++
 sfi/sfidl-parser.cc  |    8 ++++----
 sfi/sfivalues.cc     |    2 +-
 sfi/sfiwrapper.cc    |    1 -
 4 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/sfi/sfidl-cxxbase.cc b/sfi/sfidl-cxxbase.cc
index ae139cf..9ee0804 100644
--- a/sfi/sfidl-cxxbase.cc
+++ b/sfi/sfidl-cxxbase.cc
@@ -14,6 +14,7 @@
 
 using namespace Sfidl;
 
+#if 0
 static String
 CxxNameToSymbol (const String &str)     // FIXME: need mammut renaming function
 {
@@ -24,6 +25,7 @@ CxxNameToSymbol (const String &str)     // FIXME: need mammut renaming function
       s[i] = '_';
   return s;
 }
+#endif
 
 static vector<String>
 split_string (const String &ctype)      // FIXME: remove once we have general renamer
diff --git a/sfi/sfidl-parser.cc b/sfi/sfidl-parser.cc
index 973bb82..da59021 100644
--- a/sfi/sfidl-parser.cc
+++ b/sfi/sfidl-parser.cc
@@ -842,7 +842,7 @@ GTokenType Parser::parseNamespace()
   bool ready = false;
   do
     {
-      switch (g_scanner_peek_next_token (scanner))
+      switch (int (g_scanner_peek_next_token (scanner)))
        {
          case TOKEN_CHOICE:
            {
@@ -1238,7 +1238,7 @@ GTokenType Parser::parseRecord ()
   while (!ready)
     {
       GTokenType expected_token;
-      switch (g_scanner_peek_next_token (scanner))
+      switch (int (g_scanner_peek_next_token (scanner)))
         {
         case G_TOKEN_IDENTIFIER:
           {
@@ -1626,10 +1626,10 @@ GTokenType Parser::parseClass ()
     }
 
   parse_or_return ('{');
-  while (g_scanner_peek_next_token (scanner) != G_TOKEN_RIGHT_CURLY)
+  while (int (g_scanner_peek_next_token (scanner) != G_TOKEN_RIGHT_CURLY))
     {
       GTokenType expected_token;
-      switch (g_scanner_peek_next_token (scanner))
+      switch (int (g_scanner_peek_next_token (scanner)))
         {
        case G_TOKEN_IDENTIFIER:
          {
diff --git a/sfi/sfivalues.cc b/sfi/sfivalues.cc
index 90669fb..33eae24 100644
--- a/sfi/sfivalues.cc
+++ b/sfi/sfivalues.cc
@@ -256,7 +256,7 @@ sfi_value_take_pspec (GValue     *value,
 {
   g_return_if_fail (SFI_VALUE_HOLDS_PSPEC (value));
 
-  g_value_set_param_take_ownership (value, pspec);
+  g_value_take_param (value, pspec);
 }
 
 SfiSeq*
diff --git a/sfi/sfiwrapper.cc b/sfi/sfiwrapper.cc
index cc401cb..4d7ad97 100644
--- a/sfi/sfiwrapper.cc
+++ b/sfi/sfiwrapper.cc
@@ -54,7 +54,6 @@ sfi_init (int *argcp, char **argv, const char *app_name, const Bse::StringVector
   else
     Rapicorn::init_core (app_name ? app_name : prg_name, argcp, argv);
 
-  g_type_init ();       /* just in case this hasn't been called already */
   _sfi_init_values ();
   _sfi_init_params ();
   _sfi_init_time ();