[yast-commit] r41208 - in /trunk/storage: libstorage/src/ package/

Author: aschnell Date: Tue Oct 2 18:42:37 2007 New Revision: 41208 URL: http://svn.opensuse.org/viewcvs/yast?rev=41208&view=rev Log: - removed some superfluous "const" to avoid gcc 4.3 warnings Modified: trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/Disk.h trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/Dm.h trunk/storage/libstorage/src/DmCo.h trunk/storage/libstorage/src/DmPartCo.h trunk/storage/libstorage/src/DmraidCo.h trunk/storage/libstorage/src/Evms.cc trunk/storage/libstorage/src/Evms.h trunk/storage/libstorage/src/EvmsAccess.cc trunk/storage/libstorage/src/EvmsAccess.h trunk/storage/libstorage/src/EvmsCo.h trunk/storage/libstorage/src/LoopCo.h trunk/storage/libstorage/src/LvmVg.h trunk/storage/libstorage/src/MdCo.h trunk/storage/libstorage/src/NfsCo.h trunk/storage/libstorage/src/Partition.cc trunk/storage/libstorage/src/Partition.h trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Container.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/Container.h (original) +++ trunk/storage/libstorage/src/Container.h Tue Oct 2 18:42:37 2007 @@ -132,7 +132,7 @@ public: Container( Storage * const, const string& Name, storage::CType typ ); Container( const Container& ); - Storage * const getStorage() const { return sto; } + Storage * getStorage() const { return sto; } virtual ~Container(); const string& name() const { return nm; } const string& device() const { return dev; } @@ -154,7 +154,7 @@ virtual string createText(bool doing=true) const; virtual int resizeVolume( Volume* v, unsigned long long newSize ); virtual int removeVolume( Volume* v ); - static storage::CType const staticType() { return storage::CUNKNOWN; } + static storage::CType staticType() { return storage::CUNKNOWN; } friend std::ostream& operator<< (std::ostream& s, const Container &c ); virtual Container* getCopy() const { return( new Container( *this ) ); } bool compareContainer( const Container* c, bool verbose ) const; Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Tue Oct 2 18:42:37 2007 @@ -55,7 +55,7 @@ bool isDasd() const { return( nm.find("dasd")==0 ); } bool isLogical( unsigned nr ) const; bool detect( ProcPart& ppart ); - static storage::CType const staticType() { return storage::DISK; } + static storage::CType staticType() { return storage::DISK; } friend std::ostream& operator<< (std::ostream&, const Disk& ); void triggerUdevUpdate(); Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Tue Oct 2 18:42:37 2007 @@ -314,7 +314,7 @@ num = mnr; } -const PeContainer* const Dm::pec() const +const PeContainer* Dm::pec() const { return(dynamic_cast(cont)); } Modified: trunk/storage/libstorage/src/Dm.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dm.h (original) +++ trunk/storage/libstorage/src/Dm.h Tue Oct 2 18:42:37 2007 @@ -62,7 +62,7 @@ protected: void init(); - const PeContainer* const pec() const; + const PeContainer* pec() const; virtual const string shortPrintedName() const { return( "Dm" ); } string getDevice( const string& majmin ); static void getDmMajor(); Modified: trunk/storage/libstorage/src/DmCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmCo.h (original) +++ trunk/storage/libstorage/src/DmCo.h Tue Oct 2 18:42:37 2007 @@ -16,7 +16,7 @@ DmCo( Storage * const s, bool detect, ProcPart& ppart ); DmCo( const DmCo& rhs ); virtual ~DmCo(); - static storage::CType const staticType() { return storage::DM; } + static storage::CType staticType() { return storage::DM; } friend std::ostream& operator<< (std::ostream&, const DmCo& ); bool equalContent( const Container& rhs ) const; void logDifference( const Container& d ) const; Modified: trunk/storage/libstorage/src/DmPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.h (original) +++ trunk/storage/libstorage/src/DmPartCo.h Tue Oct 2 18:42:37 2007 @@ -31,7 +31,7 @@ const string& udevPath() const { return udev_path; } const std::list<string>& udevId() const { return udev_id; } unsigned numPartitions() const { return disk->numPartitions(); } - static storage::CType const staticType() { return storage::DMRAID; } + static storage::CType staticType() { return storage::DMRAID; } friend std::ostream& operator<< (std::ostream&, const DmPartCo& ); void setUdevData( const string& id ); Modified: trunk/storage/libstorage/src/DmraidCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.h (original) +++ trunk/storage/libstorage/src/DmraidCo.h Tue Oct 2 18:42:37 2007 @@ -25,7 +25,7 @@ DmraidCo( const DmraidCo& rhs ); virtual ~DmraidCo(); - static storage::CType const staticType() { return storage::DMRAID; } + static storage::CType staticType() { return storage::DMRAID; } friend std::ostream& operator<< (std::ostream&, const DmraidCo& ); void getInfo( storage::DmraidCoInfo& info ) const; void setUdevData( const string& id ); Modified: trunk/storage/libstorage/src/Evms.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Evms.cc?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/Evms.cc (original) +++ trunk/storage/libstorage/src/Evms.cc Tue Oct 2 18:42:37 2007 @@ -86,7 +86,7 @@ } } -const EvmsCo* const Evms::evmsCo() const +const EvmsCo* Evms::evmsCo() const { return(dynamic_cast(cont)); } Modified: trunk/storage/libstorage/src/Evms.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Evms.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/Evms.h (original) +++ trunk/storage/libstorage/src/Evms.h Tue Oct 2 18:42:37 2007 @@ -28,7 +28,7 @@ void getInfo(storage::EvmsInfo&) const; bool equalContent( const Evms& rhs ) const; void logDifference( const Evms& d ) const; - const EvmsCo* const evmsCo() const; + const EvmsCo* evmsCo() const; protected: void init( const string& name ); Modified: trunk/storage/libstorage/src/EvmsAccess.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EvmsAccess.cc?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/EvmsAccess.cc (original) +++ trunk/storage/libstorage/src/EvmsAccess.cc Tue Oct 2 18:42:37 2007 @@ -775,7 +775,7 @@ } } -EvmsObject *const EvmsAccess::addObject( object_handle_t id ) +EvmsObject * EvmsAccess::addObject( object_handle_t id ) { EvmsObject * ret; if( (ret=find( id )) == NULL ) @@ -828,7 +828,7 @@ return( ret ); } -EvmsObject *const EvmsAccess::find( object_handle_t id ) +EvmsObject * EvmsAccess::find( object_handle_t id ) { EvmsObject *ret = NULL; list::const_iterator Ptr_Ci = objects.begin(); Modified: trunk/storage/libstorage/src/EvmsAccess.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EvmsAccess.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/EvmsAccess.h (original) +++ trunk/storage/libstorage/src/EvmsAccess.h Tue Oct 2 18:42:37 2007 @@ -33,7 +33,7 @@ ObjType type() const { return typ; }; const string& name() const { return nam; }; - const object_handle_t id() const { return idt; }; + object_handle_t id() const { return idt; }; void disownPtr() { own_ptr = false; }; void output( std::ostream& Stream ) const; @@ -61,8 +61,8 @@ public: EvmsDataObject( EvmsObject *const obj ); EvmsDataObject( object_handle_t id ); - const EvmsObject *const consumedBy() const { return consumed; }; - const EvmsObject *const volume() const { return vol; }; + const EvmsObject * consumedBy() const { return consumed; }; + const EvmsObject * volume() const { return vol; }; void output( std::ostream& Stream ) const; virtual void addRelation( EvmsAccess* Acc ); @@ -141,8 +141,8 @@ class EvmsAccess { public: - EvmsObject *const addObject( object_handle_t id ); - EvmsObject *const find( object_handle_t id ); + EvmsObject * addObject( object_handle_t id ); + EvmsObject * find( object_handle_t id ); EvmsAccess(); ~EvmsAccess(); void output( std::ostream &Stream ) const; Modified: trunk/storage/libstorage/src/EvmsCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EvmsCo.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/EvmsCo.h (original) +++ trunk/storage/libstorage/src/EvmsCo.h Tue Oct 2 18:42:37 2007 @@ -92,7 +92,7 @@ unsigned numVol() const { return vols.size(); } bool lvm2() const { return( !lvm1 ); } bool isContainer() const { return( container ); } - static storage::CType const staticType() { return storage::EVMS; } + static storage::CType staticType() { return storage::EVMS; } friend std::ostream& operator<< (std::ostream&, const EvmsCo& ); int removeCo(); Modified: trunk/storage/libstorage/src/LoopCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/LoopCo.h (original) +++ trunk/storage/libstorage/src/LoopCo.h Tue Oct 2 18:42:37 2007 @@ -17,7 +17,7 @@ LoopCo( const LoopCo& rhs ); virtual ~LoopCo(); - static storage::CType const staticType() { return storage::LOOP; } + static storage::CType staticType() { return storage::LOOP; } friend std::ostream& operator<< (std::ostream&, const LoopCo& ); int createLoop( const string& file, bool reuseExisting, Modified: trunk/storage/libstorage/src/LvmVg.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmVg.h (original) +++ trunk/storage/libstorage/src/LvmVg.h Tue Oct 2 18:42:37 2007 @@ -19,7 +19,7 @@ unsigned numLv() const { return vols.size(); } bool lvm2() const { return( !lvm1 ); } bool inactive() const { return( inactiv ); } - static storage::CType const staticType() { return storage::LVM; } + static storage::CType staticType() { return storage::LVM; } friend std::ostream& operator<< (std::ostream&, const LvmVg& ); int removeVg(); Modified: trunk/storage/libstorage/src/MdCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/MdCo.h (original) +++ trunk/storage/libstorage/src/MdCo.h Tue Oct 2 18:42:37 2007 @@ -18,7 +18,7 @@ MdCo( const MdCo& rhs ); virtual ~MdCo(); - static storage::CType const staticType() { return storage::MD; } + static storage::CType staticType() { return storage::MD; } friend std::ostream& operator<< (std::ostream&, const MdCo& ); int createMd( unsigned num, storage::MdType type, Modified: trunk/storage/libstorage/src/NfsCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/NfsCo.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/NfsCo.h (original) +++ trunk/storage/libstorage/src/NfsCo.h Tue Oct 2 18:42:37 2007 @@ -16,7 +16,7 @@ NfsCo( const NfsCo& rhs ); virtual ~NfsCo(); - static storage::CType const staticType() { return storage::NFSC; } + static storage::CType staticType() { return storage::NFSC; } friend std::ostream& operator<< ( std::ostream&, const NfsCo& ); int addNfs( const string& nfsDev, unsigned long long sizeK, const string& mp ); Modified: trunk/storage/libstorage/src/Partition.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition.cc?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/Partition.cc (original) +++ trunk/storage/libstorage/src/Partition.cc Tue Oct 2 18:42:37 2007 @@ -283,7 +283,7 @@ return( txt ); } -const Disk* const Partition::disk() const +const Disk* Partition::disk() const { return(dynamic_cast(cont)); } Modified: trunk/storage/libstorage/src/Partition.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition.h?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/libstorage/src/Partition.h (original) +++ trunk/storage/libstorage/src/Partition.h Tue Oct 2 18:42:37 2007 @@ -57,7 +57,7 @@ string setTypeText( bool doing=true ) const; int setFormat( bool format=true, storage::FsType fs=storage::REISERFS ); int changeMount( const string& val ); - const Disk* const disk() const; + const Disk* disk() const; bool isWindows() const; friend std::ostream& operator<< (std::ostream& s, const Partition &p ); static bool notDeleted( const Partition&d ) { return( !d.deleted() ); } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=41208&r1=41207&r2=41208&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Oct 2 18:42:37 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 02 18:44:07 CEST 2007 - aschnell@suse.de + +- fixed compiling with gcc 4.3 + +------------------------------------------------------------------- Thu Sep 27 16:21:28 CEST 2007 - fehr@suse.de - fix wrong display of cryptotab instead of fstab @@ -7,7 +12,7 @@ ------------------------------------------------------------------- Wed Sep 26 12:00:06 CEST 2007 - fehr@suse.de -- allow also device, uuid and label as default mount-by in +- allow also device, uuid and label as default mount-by in /etc/sysconfig/storage - make warning at start of yast2 disk suppressible - version 2.16.0 @@ -60,7 +65,7 @@ ------------------------------------------------------------------- Wed Sep 5 12:02:21 CEST 2007 - fehr@suse.de -- fix another case of nonzero passno for encrypted fstab +- fix another case of nonzero passno for encrypted fstab entries (#307221) ------------------------------------------------------------------- @@ -88,7 +93,7 @@ ------------------------------------------------------------------- Tue Aug 28 17:28:32 CEST 2007 - fehr@suse.de -- try a remount if fstab options change and umount/mount is not +- try a remount if fstab options change and umount/mount is not possible (#304841) ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org