diff widgets/SubdividingMenu.cpp @ 706:97ea68f62c1f imaf_enc

Merge from default branch

--- a/widgets/SubdividingMenu.cpp	Mon Nov 04 17:12:32 2013 +0000
+++ b/widgets/SubdividingMenu.cpp	Thu Dec 05 09:47:02 2013 +0000
@@ -17,6 +17,8 @@
 
 #include <iostream>
 
+#include "base/Debug.h"
+
 using std::set;
 using std::map;
 
@@ -81,7 +83,7 @@
             firstInitialInChunk = initial;
         }
 
-//        std::cerr << "count = "<< count << ", upper limit = " << m_upperLimit << std::endl;
+//        cerr << "count = "<< count << ", upper limit = " << m_upperLimit << endl;
 
         bool lastInChunk = (k == entries.end() ||
                             (count >= m_lowerLimit-1 &&
@@ -134,7 +136,7 @@
 SubdividingMenu::entriesAdded()
 {
     if (m_entriesSet) {
-        std::cerr << "ERROR: SubdividingMenu::entriesAdded: setEntries was also called -- should use one mechanism or the other, but not both" << std::endl;
+        cerr << "ERROR: SubdividingMenu::entriesAdded: setEntries was also called -- should use one mechanism or the other, but not both" << endl;
         return;
     }