Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / GXpmBtnTbl.C

diff --git a/src/frontends/gtk/GXpmBtnTbl.C b/src/frontends/gtk/GXpmBtnTbl.C
index 53a6f5ef09e5155f8426c1025bd6578434d0b5a4..73390e64b1c6e55a2c905fafc693859002584415 100644 (file)
--- a/src/frontends/gtk/GXpmBtnTbl.C
+++ b/src/frontends/gtk/GXpmBtnTbl.C
@@ -10,11 +10,16 @@
 
 #include <config.h>
 
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "GXpmBtnTbl.h"
 
 #include <gtkmm.h>
 
-#include <cassert>
+#include <boost/assert.hpp>
 
 
 void GXpmBtnTbl::GXpmBtn::setXpm(XpmData xpm)
@@ -65,10 +70,10 @@ GXpmBtnTbl::~GXpmBtnTbl()
 
 void GXpmBtnTbl::construct()
 {
-       assert(rows_);
-       assert(cols_);
+       BOOST_ASSERT(rows_);
+       BOOST_ASSERT(cols_);
        btns_.reset(new GXpmBtn[rows_ * cols_]);
-       assert(btns_.get());
+       BOOST_ASSERT(btns_.get());
 
        for (int row = 0; row < rows_; ++row)
                for (int col = 0; col < cols_; ++col) {