[nemiver] Unconditionally switch to variable objects



commit 82483be857b8823877a08ddb54944492f40e795c
Author: Dodji Seketeli <dodji redhat com>
Date:   Sun Jul 12 10:01:42 2009 +0200

    Unconditionally switch to variable objects
    
    	* configure.ac: Remove the handling of --with-varobjs from
    	configure.
    	* src/persp/dbgperspective/nmv-local-vars-inspector.[cc|h]: Remove.
    	* src/persp/dbgperspective/nmv-var-inspector.[cc|h]: Remove.
    	* src/persp/dbgperspective/Makefile.am: Removed
    	nmv-local-vars-inspector.[cc|h], nmv-var-inspector.[cc|h].
    	* po/POTFILES.in: Remove nmv-local-vars-inspector.cc.
    	Add nmv-var-inspector2.cc.
    	* src/persp/dbgperspective/nmv-dbg-perspective.cc (lots):
            Remove WITH_VAROBJS macro. Unconditionally use
    	LocalVarsInspector2 instead of LocalVarsInspector.
    	(DBGPerspective::try_to_request_show_variable_value_at_position):
    	Unconditionally create variable object.
    	* src/persp/dbgperspective/nmv-local-vars-inspector2.[cc|h]:
    	Remove use of the conditional macro WITH_VAROBJS.
    	* src/persp/dbgperspective/nmv-var-inspector-dialog.cc: Remove
    	use of the conditional macro WITH_VAROBJS. Unconditionally use
    	VarInspector2 instead of VarInspector.
    	* src/persp/dbgperspective/nmv-var-inspector2.[cc|h]: Remove
    	conditional macro WITH_VAROBJS.
    	* src/persp/dbgperspective/nmv-watchpoint-dialog.cc: Likewise.
    	* tests/Makefile.am: Likewise.
    	* tests/test-var-path-expr.cc: Likewise.
    	* tests/test-watchpoint.cc: Likewise.

 configure.ac                                       |   13 -
 po/POTFILES.in                                     |    3 +-
 src/persp/dbgperspective/Makefile.am               |    4 -
 src/persp/dbgperspective/nmv-dbg-perspective.cc    |   52 +--
 .../dbgperspective/nmv-local-vars-inspector.cc     |  910 --------------------
 .../dbgperspective/nmv-local-vars-inspector.h      |   70 --
 .../dbgperspective/nmv-local-vars-inspector2.cc    |    3 -
 .../dbgperspective/nmv-local-vars-inspector2.h     |    3 -
 .../dbgperspective/nmv-var-inspector-dialog.cc     |   12 -
 src/persp/dbgperspective/nmv-var-inspector.cc      |  285 ------
 src/persp/dbgperspective/nmv-var-inspector.h       |   63 --
 src/persp/dbgperspective/nmv-var-inspector2.cc     |    4 -
 src/persp/dbgperspective/nmv-var-inspector2.h      |    4 -
 src/persp/dbgperspective/nmv-watchpoint-dialog.cc  |    2 -
 tests/Makefile.am                                  |   17 +-
 tests/test-var-path-expr.cc                        |    4 -
 tests/test-watchpoint.cc                           |    4 -
 17 files changed, 5 insertions(+), 1448 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7a9f886..7f5e9f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,18 +212,6 @@ AC_ARG_ENABLE(symsvis,
               ENABLE_GCC_SYMBOLS_VISIBILITY=$enableval,
               ENABLE_GCC_SYMBOLS_VISIBILITY=no)
 
-ENABLE_VAROBJS=yes
-AC_ARG_ENABLE(varobjs,
-              AC_HELP_STRING([--enable-varobjs=yes|no],
-                             [enable variable objects support. default is yes]),
-              ENABLE_VAROBJS=$enableval,
-              ENABLE_VAROBJS=yes)
-if test x$ENABLE_VAROBJS = xyes; then
-    AC_DEFINE([WITH_VAROBJS], 1, [build with varable objects support])
-fi
-
-AM_CONDITIONAL(VAROBJS, test x$ENABLE_VAROBJS = xyes)
-
 dnl *******************************
 dnl checking for libraries we use
 dnl *******************************
@@ -478,7 +466,6 @@ cat <<EOT
     Enable memory view              : ${ENABLE_MEMORYVIEW} (requires gtkhex > $GTKHEX_VERSION)
     gtksourceviewmm version         : ${LIBGTKSOURCEVIEWMM_PKG}
     VFS library                     : ${VFS_PKG}
-    varobjs                         : ${ENABLE_VAROBJS}
     Enable symbols visibility ctrl  : ${ENABLE_GCC_SYMBOLS_VISIBILITY}
     Maintainer mode                 : ${USER_MAINTAINER_MODE}
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6d592ec..9d203b6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,7 +23,6 @@ src/persp/dbgperspective/nmv-breakpoints-view.cc
 src/persp/dbgperspective/nmv-call-stack.cc
 src/persp/dbgperspective/nmv-dbg-perspective.cc
 src/persp/dbgperspective/nmv-file-list.cc
-src/persp/dbgperspective/nmv-local-vars-inspector.cc
 src/persp/dbgperspective/nmv-locate-file-dialog.cc
 src/persp/dbgperspective/nmv-memory-view.cc
 src/persp/dbgperspective/nmv-preferences-dialog.cc
@@ -32,7 +31,7 @@ src/persp/dbgperspective/nmv-registers-view.cc
 src/persp/dbgperspective/nmv-run-program-dialog.cc
 src/persp/dbgperspective/nmv-saved-sessions-dialog.cc
 src/persp/dbgperspective/nmv-thread-list.cc
-src/persp/dbgperspective/nmv-var-inspector.cc
+src/persp/dbgperspective/nmv-var-inspector2.cc
 src/persp/dbgperspective/nmv-var-inspector-dialog.cc
 src/persp/dbgperspective/nmv-local-vars-inspector2.cc
 src/persp/dbgperspective/nmv-var-inspector2.cc
diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index a81d704..dc7e243 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -48,14 +48,10 @@ nmv-call-stack.cc \
 nmv-call-stack.h \
 nmv-variables-utils.cc \
 nmv-variables-utils.h \
-nmv-local-vars-inspector.cc \
-nmv-local-vars-inspector.h \
 nmv-local-vars-inspector2.cc \
 nmv-local-vars-inspector2.h \
 nmv-global-vars-inspector-dialog.cc \
 nmv-global-vars-inspector-dialog.h \
-nmv-var-inspector.cc \
-nmv-var-inspector.h \
 nmv-var-inspector2.cc \
 nmv-var-inspector2.h \
 nmv-breakpoints-view.cc \
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 8b1f714..a1e68fc 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -75,12 +75,8 @@
 #include "nmv-ui-utils.h"
 #include "nmv-call-stack.h"
 #include "nmv-spinner-tool-item.h"
-#ifdef WITH_VAROBJS
 #include "nmv-local-vars-inspector2.h"
 #include "nmv-var-inspector2.h"
-#else
-#include "nmv-local-vars-inspector.h"
-#endif
 #include "nmv-global-vars-inspector-dialog.h"
 #include "nmv-terminal.h"
 #include "nmv-breakpoints-view.h"
@@ -102,9 +98,7 @@
 #include "nmv-memory-view.h"
 #endif // WITH_MEMORYVIEW
 
-#ifdef WITH_VAROBJS
 #include "nmv-watchpoint-dialog.h"
-#endif //WITH_VAROBJS
 
 using namespace std;
 using namespace nemiver::common;
@@ -278,9 +272,7 @@ private:
     void on_continue_until_action ();
     void on_set_breakpoint_action ();
     void on_set_breakpoint_using_dialog_action ();
-#ifdef WITH_VAROBJS
     void on_set_watchpoint_using_dialog_action ();
-#endif
     void on_refresh_locals_action ();
     void on_toggle_breakpoint_action ();
     void on_toggle_breakpoint_enabled_action ();
@@ -389,15 +381,12 @@ private:
                                     (const UString &a_var_name,
                                      const IDebugger::VariableSafePtr &a_var,
                                      const UString &a_cooker);
-#ifdef WITH_VAROBJS
 
     void on_variable_created_for_tooltip_signal
                                     (const IDebugger::VariableSafePtr);
     void on_popup_var_insp_size_request (Gtk::Requisition*, Gtk::Widget *);
     void on_popup_tip_hide ();
 
-#endif // WITH_VAROBJS
-
     bool on_file_content_changed (const UString &a_path);
     void on_notebook_tabs_reordered(Gtk::Widget* a_page, guint a_page_num);
 
@@ -453,13 +442,10 @@ private:
     void try_to_request_show_variable_value_at_position (int a_x, int a_y);
     void show_underline_tip_at_position (int a_x, int a_y,
                                          const UString &a_text);
-#ifdef WITH_VAROBJS
     void show_underline_tip_at_position (int a_x, int a_y,
                                          IDebugger::VariableSafePtr a_var);
     VarInspector2& get_popup_var_inspector ();
     void pack_popup_var_inspector_in_new_scr_win (Gtk::ScrolledWindow *);
-#endif // WITH_VAROBJS
-
     void restart_mouse_immobile_timer ();
     void stop_mouse_immobile_timer ();
     PopupTip& get_popup_tip ();
@@ -584,9 +570,7 @@ public:
                                       const int a_line_num);
     void set_breakpoint_using_dialog (const UString &a_function_name);
     void set_breakpoint_from_dialog (SetBreakpointDialog &a_dialog);
-#ifdef WITH_VAROBJS
     void set_watchpoint_using_dialog ();
-#endif
     void refresh_locals ();
 
     void inspect_variable ();
@@ -634,11 +618,8 @@ public:
     Gtk::ScrolledWindow& get_thread_list_scrolled_win ();
 
     Gtk::HPaned& get_call_stack_paned ();
-#ifdef WITH_VAROBJS
+
     LocalVarsInspector2& get_local_vars_inspector ();
-#else
-    LocalVarsInspector& get_local_vars_inspector ();
-#endif
 
     Gtk::ScrolledWindow& get_local_vars_inspector_scrolled_win ();
 
@@ -839,11 +820,7 @@ struct DBGPerspective::Priv {
 #endif // WITH_GIO
     Path2MonitorMap path_2_monitor_map;
     Gtk::Notebook *statuses_notebook;
-#ifdef WITH_VAROBJS
     SafePtr<LocalVarsInspector2> variables_editor;
-#else
-    SafePtr<LocalVarsInspector> variables_editor;
-#endif
     SafePtr<Gtk::ScrolledWindow> variables_editor_scrolled_win;
     SafePtr<Terminal> terminal;
     SafePtr<Gtk::Box> terminal_box;
@@ -890,9 +867,7 @@ struct DBGPerspective::Priv {
     //<variable value popup tip related data>
     //****************************************
     SafePtr<PopupTip> popup_tip;
-#ifdef WITH_VAROBJS
     SafePtr<VarInspector2> popup_var_inspector;
-#endif
     bool in_show_var_value_at_pos_transaction;
     UString var_to_popup;
     int var_popup_tip_x;
@@ -1448,7 +1423,6 @@ DBGPerspective::on_set_breakpoint_using_dialog_action ()
     NEMIVER_CATCH
 }
 
-#ifdef WITH_VAROBJS
 void
 DBGPerspective::on_set_watchpoint_using_dialog_action ()
 {
@@ -1460,7 +1434,6 @@ DBGPerspective::on_set_watchpoint_using_dialog_action ()
 
     NEMIVER_CATCH
 }
-#endif
 
 void
 DBGPerspective::on_refresh_locals_action ()
@@ -2491,7 +2464,6 @@ DBGPerspective::on_debugger_variable_value_signal
     NEMIVER_CATCH
 }
 
-#ifdef WITH_VAROBJS
 void
 DBGPerspective::on_variable_created_for_tooltip_signal
                                 (const IDebugger::VariableSafePtr a_var)
@@ -2595,7 +2567,6 @@ DBGPerspective::on_popup_tip_hide ()
 
     NEMIVER_CATCH
 }
-#endif // WITH_VAROBJS
 
 bool
 DBGPerspective::on_file_content_changed (const UString &a_path)
@@ -3054,7 +3025,6 @@ DBGPerspective::init_actions ()
             ActionEntry::DEFAULT,
             "<control><shift>B"
         },
-#ifdef WITH_VAROBJS
         {
             "SetWatchPointUsingDialogMenuItemAction",
             nil_stock_id,
@@ -3066,7 +3036,6 @@ DBGPerspective::init_actions ()
             ActionEntry::DEFAULT,
             "<control>T"
         },
-#endif
         {
             "InspectVariableMenuItemAction",
             nil_stock_id,
@@ -4306,14 +4275,10 @@ DBGPerspective::try_to_request_show_variable_value_at_position (int a_x,
     m_priv->var_popup_tip_x = abs_x;
     m_priv->var_popup_tip_y = abs_y;
     m_priv->var_to_popup = var_name;
-#ifdef WITH_VAROBJS
     debugger ()->create_variable
         (var_name,
          sigc::mem_fun (*this,
                         &DBGPerspective::on_variable_created_for_tooltip_signal));
-#else
-    debugger ()->print_variable_value (var_name);
-#endif
 }
 
 void
@@ -4329,7 +4294,6 @@ DBGPerspective::show_underline_tip_at_position (int a_x,
     get_popup_tip ().show_at_position (a_x, a_y);
 }
 
-#ifdef WITH_VAROBJS
 void
 DBGPerspective::show_underline_tip_at_position
                                         (int a_x, int a_y,
@@ -4372,8 +4336,6 @@ DBGPerspective::pack_popup_var_inspector_in_new_scr_win
     a_win->add (get_popup_var_inspector ().widget ());
 }
 
-#endif // WITH_VAROBJS
-
 void
 DBGPerspective::restart_mouse_immobile_timer ()
 {
@@ -4405,14 +4367,12 @@ DBGPerspective::get_popup_tip ()
 
     if (!m_priv->popup_tip) {
         m_priv->popup_tip.reset (new PopupTip);
-#ifdef WITH_VAROBJS
         Gtk::ScrolledWindow *w = Gtk::manage (new Gtk::ScrolledWindow ());
         w->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
         pack_popup_var_inspector_in_new_scr_win (w);
         m_priv->popup_tip->set_child (*w);
         m_priv->popup_tip->signal_hide ().connect (sigc::mem_fun
                    (*this, &DBGPerspective::on_popup_tip_hide));
-#endif
     }
     THROW_IF_FAIL (m_priv->popup_tip);
     return *m_priv->popup_tip;
@@ -6234,7 +6194,6 @@ DBGPerspective::set_breakpoint_using_dialog (const UString &a_function_name)
     set_breakpoint_from_dialog (dialog);
 }
 
-#ifdef WITH_VAROBJS
 void
 DBGPerspective::set_watchpoint_using_dialog ()
 {
@@ -6255,7 +6214,6 @@ DBGPerspective::set_watchpoint_using_dialog ()
                                  mode & WatchpointDialog::WRITE_MODE,
                                  mode & WatchpointDialog::READ_MODE);
 }
-#endif
 
 void
 DBGPerspective::refresh_locals ()
@@ -6545,11 +6503,7 @@ DBGPerspective::get_thread_list_scrolled_win ()
     return *m_priv->thread_list_scrolled_win;
 }
 
-#ifdef WITH_VAROBJS
 LocalVarsInspector2&
-#else
-LocalVarsInspector&
-#endif
 DBGPerspective::get_local_vars_inspector ()
 {
     THROW_IF_FAIL (m_priv);
@@ -6557,11 +6511,7 @@ DBGPerspective::get_local_vars_inspector ()
 
     if (!m_priv->variables_editor) {
         m_priv->variables_editor.reset
-#ifdef WITH_VAROBJS
             (new LocalVarsInspector2 (debugger (),
-#else
-            (new LocalVarsInspector (debugger (),
-#endif
                                      *m_priv->workbench,
                                      *this));
     }
diff --git a/src/persp/dbgperspective/nmv-local-vars-inspector2.cc b/src/persp/dbgperspective/nmv-local-vars-inspector2.cc
index 8a451d7..4bbe96d 100644
--- a/src/persp/dbgperspective/nmv-local-vars-inspector2.cc
+++ b/src/persp/dbgperspective/nmv-local-vars-inspector2.cc
@@ -38,8 +38,6 @@
 #include "nmv-vars-treeview.h"
 #include "nmv-debugger-utils.h"
 
-#ifdef WITH_VAROBJS
-
 using namespace nemiver::common;
 namespace vutil=nemiver::variables_utils2;
 namespace dutil=nemiver::debugger_utils;
@@ -1138,4 +1136,3 @@ LocalVarsInspector2::re_init_widget ()
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //WITH_VAROBJS
diff --git a/src/persp/dbgperspective/nmv-local-vars-inspector2.h b/src/persp/dbgperspective/nmv-local-vars-inspector2.h
index d871514..a00c3f3 100644
--- a/src/persp/dbgperspective/nmv-local-vars-inspector2.h
+++ b/src/persp/dbgperspective/nmv-local-vars-inspector2.h
@@ -31,8 +31,6 @@
 #include "nmv-i-perspective.h"
 #include "nmv-i-debugger.h"
 
-#ifdef WITH_VAROBJS
-
 namespace Gtk {
     class Widget;
 }
@@ -68,7 +66,6 @@ public:
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //WITH_VAROBJS
 #endif //__NMV_LOCAL_VARS_INSPECTOR_H__
 
 
diff --git a/src/persp/dbgperspective/nmv-var-inspector-dialog.cc b/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
index d188059..314be1f 100644
--- a/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
+++ b/src/persp/dbgperspective/nmv-var-inspector-dialog.cc
@@ -27,11 +27,7 @@
 #include <gtkmm/liststore.h>
 #include "common/nmv-exception.h"
 #include "nmv-var-inspector-dialog.h"
-#ifdef WITH_VAROBJS
 #include "nmv-var-inspector2.h"
-#else
-#include "nmv-var-inspector.h"
-#endif //WITH_VAROBJS
 #include "nmv-ui-utils.h"
 
 NEMIVER_BEGIN_NAMESPACE (nemiver)
@@ -55,11 +51,7 @@ class VarInspectorDialog::Priv {
     Gtk::ComboBoxEntry *var_name_entry;
     Glib::RefPtr<Gtk::ListStore> m_variable_history;
     Gtk::Button *inspect_button;
-#ifdef WITH_VAROBJS
     SafePtr<VarInspector2> var_inspector;
-#else
-    SafePtr<VarInspector> var_inspector;
-#endif //WITH_VAROBJS
     Gtk::Dialog &dialog;
     Glib::RefPtr<Gnome::Glade::Xml> glade;
     IDebuggerSafePtr debugger;
@@ -104,12 +96,8 @@ public:
         Gtk::Box *box =
             ui_utils::get_widget_from_glade<Gtk::Box> (glade,
                                                        "inspectorwidgetbox");
-#ifdef WITH_VAROBJS
         var_inspector.reset (new VarInspector2 (debugger, perspective));
         var_inspector->enable_contextual_menu (true);
-#else
-        var_inspector.reset (new VarInspector (debugger));
-#endif // WITH_VAROBJS
         THROW_IF_FAIL (var_inspector);
 
         Gtk::ScrolledWindow *scr = Gtk::manage (new Gtk::ScrolledWindow);
diff --git a/src/persp/dbgperspective/nmv-var-inspector2.cc b/src/persp/dbgperspective/nmv-var-inspector2.cc
index f80646d..a26ae52 100644
--- a/src/persp/dbgperspective/nmv-var-inspector2.cc
+++ b/src/persp/dbgperspective/nmv-var-inspector2.cc
@@ -36,8 +36,6 @@
 #include "nmv-vars-treeview.h"
 #include "nmv-debugger-utils.h"
 
-#ifdef WITH_VAROBJS
-
 namespace uutil = nemiver::ui_utils;
 namespace vutil = nemiver::variables_utils2;
 namespace dutil = nemiver::debugger_utils;
@@ -663,5 +661,3 @@ VarInspector2::clear ()
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //WITH_VAROBJS
-
diff --git a/src/persp/dbgperspective/nmv-var-inspector2.h b/src/persp/dbgperspective/nmv-var-inspector2.h
index b49bca7..f2471b7 100644
--- a/src/persp/dbgperspective/nmv-var-inspector2.h
+++ b/src/persp/dbgperspective/nmv-var-inspector2.h
@@ -30,8 +30,6 @@
 #include "nmv-i-debugger.h"
 #include "nmv-i-perspective.h"
 
-#ifdef WITH_VAROBJS
-
 namespace Gtk {
     class Widget;
 }
@@ -66,7 +64,5 @@ public:
 
 NEMIVER_END_NAMESPACE (nemiver)
 
-#endif //WITH_VAROBJS
-
 #endif //__NMV_VAR_INSPECTOR2_H__
 
diff --git a/src/persp/dbgperspective/nmv-watchpoint-dialog.cc b/src/persp/dbgperspective/nmv-watchpoint-dialog.cc
index 5ef65b7..e7e169a 100644
--- a/src/persp/dbgperspective/nmv-watchpoint-dialog.cc
+++ b/src/persp/dbgperspective/nmv-watchpoint-dialog.cc
@@ -23,7 +23,6 @@
  */
 #include <glib/gi18n.h>
 #include "nmv-watchpoint-dialog.h"
-#ifdef WITH_VAROBJS
 #include <libglademm.h>
 #include <gtkmm/dialog.h>
 #include "common/nmv-exception.h"
@@ -309,5 +308,4 @@ operator&= (WatchpointDialog::Mode &a_l,
 }
 
 NEMIVER_END_NAMESPACE (nemiver)
-#endif // WITH_VAROBJS
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ebeb902..ddc21e6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,3 @@
-if VAROBJS
-    WATCHPOINT_TEST=runtestwatchpoint
-    VAR_PATH_EXPR_TEST=runtestvarpathexpr
-    VAROBJ_WALKER_TEST=runtestvarobjwalker
-else
-    WATCHPOINT_TEST=
-endif
-
 if AUTOTESTS
 # 'make check' automatically runs programs listed in the TESTS variable
 
@@ -15,10 +7,10 @@ if AUTOTESTS
 TESTS=\
 runtestgdbmi runtestunicode \
 runtestvars runtestcpptrait runtestvarlist \
-runtestvarwalker $(VAROBJ_WALKER_TEST) runtestbreakpoint \
-$(WATCHPOINT_TEST) runtestderef \
+runtestvarwalker runtestvarobjwalker runtestbreakpoint \
+runtestwatchpoint runtestderef \
 runtestlocalvarslist runtestcpplexer \
-runtestcppparser $(VAR_PATH_EXPR_TEST) \
+runtestcppparser runtestvarpathexpr \
 runtestlibtoolwrapperdetection \
 runtestenv runtesttypes
 
@@ -55,7 +47,6 @@ runtestbreakpoint_SOURCES=test-breakpoint.cc
 runtestbreakpoint_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la
 
-if VAROBJS
 runtestwatchpoint_SOURCES=test-watchpoint.cc
 runtestwatchpoint_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la
@@ -68,8 +59,6 @@ runtestvarobjwalker_SOURCES=test-varobj-walker.cc
 runtestvarobjwalker_LDADD= NEMIVERCOMMON_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIB@ \
 $(top_builddir)/src/common/libnemivercommon.la
 
-endif
-
 #runtestoverloads_SOURCES=test-overloads.cc
 #runtestoverloads_LDADD= NEMIVERCOMMON_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIB@ \
 #$(top_builddir)/src/common/libnemivercommon.la
diff --git a/tests/test-var-path-expr.cc b/tests/test-var-path-expr.cc
index 6f1de6d..c531f26 100644
--- a/tests/test-var-path-expr.cc
+++ b/tests/test-var-path-expr.cc
@@ -9,8 +9,6 @@
 using namespace nemiver;
 using namespace nemiver::common ;
 
-#ifdef WITH_VAROBJS
-
 Glib::RefPtr<Glib::MainLoop> loop =
     Glib::MainLoop::create (Glib::MainContext::get_default ()) ;
 
@@ -154,5 +152,3 @@ test_main (int argc, char *argv[])
     return 0 ;
 }
 
-#endif // WITH_VAROBJS
-
diff --git a/tests/test-watchpoint.cc b/tests/test-watchpoint.cc
index 3b46859..ab9faf5 100644
--- a/tests/test-watchpoint.cc
+++ b/tests/test-watchpoint.cc
@@ -5,8 +5,6 @@
 #include "common/nmv-safe-ptr-utils.h"
 #include "nmv-i-debugger.h"
 
-#ifdef WITH_VAROBJS
-
 using namespace nemiver;
 using namespace nemiver::common ;
 
@@ -120,5 +118,3 @@ test_main (int, char **)
     return 0;
 }
 
-#endif //WITH_VAROBJS
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]