aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2011-03-23 11:02:15 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-03-23 11:02:15 (GMT)
commite850b0191977da47eb7233e248dbab7ebd1d21f0 (patch)
treed3a3e33f1d4524147ddaa2b6b21e05bd142fc367 /src/fluxbox.cc
parent7ece90ad4f360b3cf11e46a00d4c1ec5b60213e9 (diff)
downloadfluxbox-e850b0191977da47eb7233e248dbab7ebd1d21f0.zip
fluxbox-e850b0191977da47eb7233e248dbab7ebd1d21f0.tar.bz2
compile fix: sunCC 5.11 (sunstudio 12) compiles and links again
biggest change: renaming of 'class Layer' to 'class ResourceLayer' in Layer.hh to handle complaints about 'ambiguous Layer: Layer or FbTk::Layer'. 'ResourceLayer' sounds crappy, but that was the best I could come up with right now.
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index ee0abae..99b9ea9 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -401,7 +401,7 @@ Fluxbox::Fluxbox(int argc, char **argv,
401 BScreen *screen = new BScreen(m_screen_rm.lock(), 401 BScreen *screen = new BScreen(m_screen_rm.lock(),
402 std::string("session.screen") + sc_nr, 402 std::string("session.screen") + sc_nr,
403 std::string("session.Screen") + sc_nr, 403 std::string("session.Screen") + sc_nr,
404 screens[s], ::Layer::NUM_LAYERS); 404 screens[s], ::ResourceLayer::NUM_LAYERS);
405 405
406 // already handled 406 // already handled
407 if (! screen->isScreenManaged()) { 407 if (! screen->isScreenManaged()) {