aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2007-10-24 19:38:27 (GMT)
committerfluxgen <fluxgen>2007-10-24 19:38:27 (GMT)
commita092d3fc1b351a4c6ea1d95757b5244bf86b8a39 (patch)
treec6680f8a1e5cc4eec176d8d608bbd08dc95910ec
parente7513df45fce2bfbbac8b764e07627dfe36e6ba5 (diff)
downloadfluxbox_paul-a092d3fc1b351a4c6ea1d95757b5244bf86b8a39.zip
fluxbox_paul-a092d3fc1b351a4c6ea1d95757b5244bf86b8a39.tar.bz2
fixed gcc 2.96 compile problem
-rw-r--r--ChangeLog2
-rw-r--r--src/Layer.hh2
-rw-r--r--src/MinOverlapPlacement.cc2
-rw-r--r--src/Workspace.cc2
4 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d38cf12..85cfb57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/10/24: 3*07/10/24:
4 * Fixed some gcc 2.96 compile issues ( Henrik )
5 Layer.hh, MinOverlapPlacement.cc, Workspace.cc
4 * Introduced (workspacename=...) for pattern matching and changed 6 * Introduced (workspacename=...) for pattern matching and changed
5 (workspace=...) to use the workspace number, indexed from 0 (Mark) 7 (workspace=...) to use the workspace number, indexed from 0 (Mark)
6 ClientPattern.cc/hh 8 ClientPattern.cc/hh
diff --git a/src/Layer.hh b/src/Layer.hh
index e86c090..aa99506 100644
--- a/src/Layer.hh
+++ b/src/Layer.hh
@@ -23,6 +23,8 @@
23#define LAYER_HH 23#define LAYER_HH
24 24
25#include <string> 25#include <string>
26#include <stdio.h>
27
26using std::string; 28using std::string;
27 29
28/** 30/**
diff --git a/src/MinOverlapPlacement.cc b/src/MinOverlapPlacement.cc
index 510f66e..ce7ff3c 100644
--- a/src/MinOverlapPlacement.cc
+++ b/src/MinOverlapPlacement.cc
@@ -155,7 +155,7 @@ bool MinOverlapPlacement::placeWindow(const FluxboxWindow &win, int head,
155 155
156 int overlap = 0; 156 int overlap = 0;
157 it = windowlist.rbegin(); 157 it = windowlist.rbegin();
158 for (; it != windowlist.rend(); ++it) { 158 for (; it != it_end; ++it) {
159 159
160 // get the dimensions of the window 160 // get the dimensions of the window
161 int left = (*it)->x() - (*it)->xOffset(); 161 int left = (*it)->x() - (*it)->xOffset();
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 73ed077..cd899c6 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -136,7 +136,7 @@ void Workspace::hideAll(bool interrupt_moving) {
136void Workspace::removeAll(unsigned int dest) { 136void Workspace::removeAll(unsigned int dest) {
137 Windows tmp_list(m_windowlist); 137 Windows tmp_list(m_windowlist);
138 Windows::iterator it = tmp_list.begin(); 138 Windows::iterator it = tmp_list.begin();
139 Windows::const_iterator it_end = tmp_list.end(); 139 Windows::iterator it_end = tmp_list.end();
140 for (; it != it_end; ++it) 140 for (; it != it_end; ++it)
141 m_screen.sendToWorkspace(dest, *it, false); 141 m_screen.sendToWorkspace(dest, *it, false);
142} 142}