diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2011-03-23 11:02:15 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2011-03-23 11:02:15 (GMT) |
commit | e850b0191977da47eb7233e248dbab7ebd1d21f0 (patch) | |
tree | d3a3e33f1d4524147ddaa2b6b21e05bd142fc367 /src/Remember.cc | |
parent | 7ece90ad4f360b3cf11e46a00d4c1ec5b60213e9 (diff) | |
download | fluxbox-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/Remember.cc')
-rw-r--r-- | src/Remember.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Remember.cc b/src/Remember.cc index a9be4bc..6dd636f 100644 --- a/src/Remember.cc +++ b/src/Remember.cc | |||
@@ -477,7 +477,7 @@ int parseApp(ifstream &file, Application &app, string *first_line = 0) { | |||
477 | else | 477 | else |
478 | had_error = true; | 478 | had_error = true; |
479 | } else if (str_key == "layer") { | 479 | } else if (str_key == "layer") { |
480 | int l = Layer::getNumFromString(str_label); | 480 | int l = ResourceLayer::getNumFromString(str_label); |
481 | had_error = (l == -1); | 481 | had_error = (l == -1); |
482 | if (!had_error) | 482 | if (!had_error) |
483 | app.rememberLayer(l); | 483 | app.rememberLayer(l); |