From 4f21142bfad31e8785a98ebdb02f0a7d8e8be234 Mon Sep 17 00:00:00 2001
From: Vitor Sousa <vitorsousa@expertisesolutions.com.br>
Date: Tue, 9 Jul 2019 10:13:27 +0200
Subject: [PATCH] cxx: fix some compilation warnings in C++ examples

Summary:
Fix some warnings in the C++ examples for elementary. These examples are build
by default in the normal meson compilation.

Only accidental warnings were fixed, explicit warnings using the `#warning`
preprocessor directive were maintained.

Test Plan: Compile with C++ binding.

Reviewers: lauromoura, felipealmeida, segfaultxavi

Reviewed By: segfaultxavi

Subscribers: bu5hm4n, cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D9244
---
 src/examples/elementary/bg_cxx_example_01.cc       | 2 ++
 src/examples/elementary/bg_cxx_example_02.cc       | 2 ++
 src/examples/elementary/button_cxx_example_00.cc   | 2 ++
 src/examples/elementary/button_cxx_example_01.cc   | 2 ++
 src/examples/elementary/calendar_cxx_example_02.cc | 1 +
 src/examples/elementary/radio_cxx_example_01.cc    | 2 ++
 src/examples/elementary/slider_cxx_example.cc      | 2 ++
 src/examples/elementary/toolbar_cxx_example_01.cc  | 2 ++
 8 files changed, 15 insertions(+)

diff --git a/src/examples/elementary/bg_cxx_example_01.cc b/src/examples/elementary/bg_cxx_example_01.cc
index 5c8a61e..4c1368a 100644
--- a/src/examples/elementary/bg_cxx_example_01.cc
+++ b/src/examples/elementary/bg_cxx_example_01.cc
@@ -1,5 +1,7 @@
 #define EFL_CXXPERIMENTAL // for background part
+#ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
+#endif
 #include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
diff --git a/src/examples/elementary/bg_cxx_example_02.cc b/src/examples/elementary/bg_cxx_example_02.cc
index 07b40ab..4969819 100644
--- a/src/examples/elementary/bg_cxx_example_02.cc
+++ b/src/examples/elementary/bg_cxx_example_02.cc
@@ -6,7 +6,9 @@
  */
 
 #define EFL_CXXPERIMENTAL
+#ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
+#endif
 
 #include <Efl_Ui.hh>
 
diff --git a/src/examples/elementary/button_cxx_example_00.cc b/src/examples/elementary/button_cxx_example_00.cc
index ff9f569..2d58c7f 100644
--- a/src/examples/elementary/button_cxx_example_00.cc
+++ b/src/examples/elementary/button_cxx_example_00.cc
@@ -1,7 +1,9 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` button_cxx_example_00.cc -o button_cxx_example_00
 
 #define EFL_CXXPERIMENTAL
+#ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
+#endif
 #include <Efl_Ui.hh>
 #include <iostream>
 
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc
index 4c53ba6..47b1b9d 100644
--- a/src/examples/elementary/button_cxx_example_01.cc
+++ b/src/examples/elementary/button_cxx_example_01.cc
@@ -1,7 +1,9 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` button_cxx_example_01.cc -o button_cxx_example_01
 
 #define EFL_CXXPERIMENTAL
+#ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
+#endif
 #include <Efl_Ui.hh>
 
 using efl::eo::instantiate;
diff --git a/src/examples/elementary/calendar_cxx_example_02.cc b/src/examples/elementary/calendar_cxx_example_02.cc
index e666ae8..dba2b1a 100644
--- a/src/examples/elementary/calendar_cxx_example_02.cc
+++ b/src/examples/elementary/calendar_cxx_example_02.cc
@@ -39,6 +39,7 @@ struct appData
         }, _1, _2);
       // FIXME XAR: I broke this and I do not know how to fix it
       // cal.format_func_set(cb_a);
+      (void)cb_a;
    }
 
    void destroy() {
diff --git a/src/examples/elementary/radio_cxx_example_01.cc b/src/examples/elementary/radio_cxx_example_01.cc
index 90a508e..b561d02 100644
--- a/src/examples/elementary/radio_cxx_example_01.cc
+++ b/src/examples/elementary/radio_cxx_example_01.cc
@@ -1,7 +1,9 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` radio_cxx_example_01.cc -o radio_cxx_example_01
 
 #define EFL_CXXPERIMENTAL
+#ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
+#endif
 #include <Efl_Ui.hh>
 #include <iostream>
 
diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc
index bc6bd76..2540516 100644
--- a/src/examples/elementary/slider_cxx_example.cc
+++ b/src/examples/elementary/slider_cxx_example.cc
@@ -1,7 +1,9 @@
 // g++ -g `pkg-config --cflags --libs elementary-cxx efl-cxx eina-cxx eo-cxx ecore-cxx evas-cxx edje-cxx` slider_cxx_example.cc -o slider_cxx_example
 
 #define EFL_CXXPERIMENTAL
+#ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
+#endif
 #include <Efl_Ui.hh>
 
 using namespace std::placeholders;
diff --git a/src/examples/elementary/toolbar_cxx_example_01.cc b/src/examples/elementary/toolbar_cxx_example_01.cc
index 278a1bf..19a9931 100644
--- a/src/examples/elementary/toolbar_cxx_example_01.cc
+++ b/src/examples/elementary/toolbar_cxx_example_01.cc
@@ -7,7 +7,9 @@
 
 #warning This example requires yet unfinished EO APIs
 
+#ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
+#endif
 #include <Efl_Ui.hh>
 
 EAPI int
-- 
2.7.4