aboutsummaryrefslogtreecommitdiff
path: root/src/Resources.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/Resources.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/Resources.cc')
-rw-r--r--src/Resources.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Resources.cc b/src/Resources.cc
index 0364477..2e07725 100644
--- a/src/Resources.cc
+++ b/src/Resources.cc
@@ -192,17 +192,17 @@ setFromString(const char *strval) {
192 192
193 193
194template<> 194template<>
195string FbTk::Resource<Layer>:: 195string FbTk::Resource<ResourceLayer>::
196getString() const { 196getString() const {
197 return ::Layer::getString(m_value.getNum()); 197 return ::ResourceLayer::getString(m_value.getNum());
198} 198}
199 199
200template<> 200template<>
201void FbTk::Resource<Layer>:: 201void FbTk::Resource<ResourceLayer>::
202setFromString(const char *strval) { 202setFromString(const char *strval) {
203 string str(strval); 203 string str(strval);
204 int tempnum = ::Layer::getNumFromString(str); 204 int tempnum = ::ResourceLayer::getNumFromString(str);
205 if (tempnum >= 0 && tempnum < ::Layer::NUM_LAYERS) 205 if (tempnum >= 0 && tempnum < ::ResourceLayer::NUM_LAYERS)
206 m_value = tempnum; 206 m_value = tempnum;
207 else 207 else
208 setDefaultValue(); 208 setDefaultValue();