Author: aschnell Date: Tue Nov 25 11:06:49 2008 New Revision: 53568 URL: http://svn.opensuse.org/viewcvs/yast?rev=53568&view=rev Log: - added const Modified: trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/src/Volume.h Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=53568&r1=53567&r2=53568&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Tue Nov 25 11:06:49 2008 @@ -3130,6 +3130,6 @@ string Volume::tmp_mount[] = { "swap", "/tmp", "/var/tmp" }; -string Volume::empty_string; -list<string> Volume::empty_slist; +const string Volume::empty_string; +const list<string> Volume::empty_slist; Modified: trunk/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?rev=53568&r1=53567&r2=53568&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.h (original) +++ trunk/storage/libstorage/src/Volume.h Tue Nov 25 11:06:49 2008 @@ -37,8 +37,8 @@ bool deleted() const { return del; } bool created() const { return create; } bool silent() const { return silnt; } - virtual const std::list<string> udevId() const { return(empty_slist); } - virtual const string& udevPath() const { return(empty_string); } + virtual const std::list<string> udevId() const { return empty_slist; } + virtual const string& udevPath() const { return empty_string; } virtual string sysfsPath() const; void setDeleted( bool val=true ) { del=val; } void setCreated( bool val=true ) { create=val; } @@ -285,8 +285,9 @@ static string mb_names[storage::MOUNTBY_PATH+1]; static string enc_names[storage::ENC_UNKNOWN+1]; static string tmp_mount[3]; - static string empty_string; - static std::list<string> empty_slist; + + static const string empty_string; + static const std::list<string> empty_slist; mutable storage::VolumeInfo info; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org