ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/brains/DataStorage.cpp
(Generate patch)

Comparing trunk/src/brains/DataStorage.cpp (file contents):
Revision 2068 by gezelter, Tue Apr 29 17:32:31 2014 UTC vs.
Revision 2069 by gezelter, Thu Mar 5 16:30:23 2015 UTC

# Line 55 | Line 55 | namespace OpenMD {
55  
56    }
57  
58 <  DataStorage::DataStorage(int size, int storageLayout) : size_(size){
58 >  DataStorage::DataStorage(std::size_t size, int storageLayout) : size_(size){
59      setStorageLayout(storageLayout);
60      resize(size);
61    }
62  
63 <  int DataStorage::getSize() {
63 >  std::size_t DataStorage::getSize() {
64  
65      if (storageLayout_ & dslPosition && position.size() != size_) {
66        //error
# Line 156 | Line 156 | namespace OpenMD {
156  
157    }
158  
159 <  void DataStorage::resize(int newSize) {
159 >  void DataStorage::resize(std::size_t newSize) {
160  
161      if (storageLayout_ & dslPosition) {
162        internalResize(position, newSize);
# Line 233 | Line 233 | namespace OpenMD {
233      size_ = newSize;
234    }
235  
236 <  void DataStorage::reserve(int size) {
236 >  void DataStorage::reserve(std::size_t size) {
237      if (storageLayout_ & dslPosition) {
238        position.reserve(size);
239      }
# Line 307 | Line 307 | namespace OpenMD {
307      }
308    }
309  
310 <  void DataStorage::copy(int source, int num, int target) {
310 >  void DataStorage::copy(int source, std::size_t num, std::size_t target) {
311      if (num + target > size_ ) {
312        //error
313      }
# Line 483 | Line 483 | namespace OpenMD {
483    }    
484  
485    template<typename T>
486 <  void DataStorage::internalResize(std::vector<T>& v, int newSize){
487 <    int oldSize = v.size();
486 >  void DataStorage::internalResize(std::vector<T>& v, std::size_t newSize){
487 >    std::size_t oldSize = v.size();
488  
489      if (oldSize == newSize) {
490        return;
# Line 499 | Line 499 | namespace OpenMD {
499    }
500  
501    template<typename T>
502 <  void DataStorage::internalCopy(std::vector<T>& v, int source,  int num, int target) {
502 >  void DataStorage::internalCopy(std::vector<T>& v, int source,
503 >                                 std::size_t num, std::size_t target) {
504      typename std::vector<T>::iterator first;
505      typename std::vector<T>::iterator last;
506      typename std::vector<T>::iterator result;
# Line 516 | Line 517 | namespace OpenMD {
517      std::copy(first, last, result);
518    }
519  
520 <  int DataStorage::getBytesPerStuntDouble(int layout) {
521 <    int bytes = 0;
520 >  std::size_t DataStorage::getBytesPerStuntDouble(int layout) {
521 >    std::size_t  bytes = 0;
522      if (layout & dslPosition) {
523        bytes += sizeof(Vector3d);
524      }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines