(file) Return to ArrayImpl.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/ArrayImpl.h between version 1.31.2.1 and 1.37.6.1

version 1.31.2.1, 2006/05/12 18:28:20 version 1.37.6.1, 2013/06/03 22:35:11
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; Symantec Corporation; The Open Group.  
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // Permission is hereby granted, free of charge, to any person obtaining a
 // of this software and associated documentation files (the "Software"), to  // copy of this software and associated documentation files (the "Software"),
 // deal in the Software without restriction, including without limitation the  // to deal in the Software without restriction, including without limitation
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // sell copies of the Software, and to permit persons to whom the Software is  // and/or sell copies of the Software, and to permit persons to whom the
 // furnished to do so, subject to the following conditions:  // Software is furnished to do so, subject to the following conditions:
 // //
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // The above copyright notice and this permission notice shall be included
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // in all copies or substantial portions of the Software.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 // Author: Mike Brasher (mbrasher@bmc.com)  //////////////////////////////////////////////////////////////////////////
 //  
 // Modified By: Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)  
 //              Mike Brasher, Inova Europe (mike-brasher@austin.rr.com)  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 177 
Line 170 
  
         if (Array_refs.get() == 1)         if (Array_refs.get() == 1)
         {         {
             memcpy(rep->data(), Array_data, Array_size*sizeof(PEGASUS_ARRAY_T));              memcpy(
                   (void*)rep->data(),
                   (void*)Array_data,
                   Array_size*sizeof(PEGASUS_ARRAY_T));
             Array_size = 0;             Array_size = 0;
         }         }
         else         else
Line 261 
Line 257 
 { {
     reserveCapacity(Array_size + size);     reserveCapacity(Array_size + size);
     memmove(     memmove(
         Array_data + size,          (void*)(Array_data + size),
         Array_data,          (void*)Array_data,
         sizeof(PEGASUS_ARRAY_T) * Array_size);         sizeof(PEGASUS_ARRAY_T) * Array_size);
     CopyToRaw(Array_data, x, size);     CopyToRaw(Array_data, x, size);
     Array_size += size;     Array_size += size;
Line 316 
Line 312 
 #endif #endif
 void Array<PEGASUS_ARRAY_T>::remove(Uint32 index, Uint32 size) void Array<PEGASUS_ARRAY_T>::remove(Uint32 index, Uint32 size)
 { {
       if (size == 0)
       {
           return;
       }
   
     if (Array_refs.get() != 1)     if (Array_refs.get() != 1)
         _rep = ArrayRep<PEGASUS_ARRAY_T>::copy_on_write(Array_rep);         _rep = ArrayRep<PEGASUS_ARRAY_T>::copy_on_write(Array_rep);
  
Line 364 
Line 365 
 PEGASUS_ARRAY_T& Array<PEGASUS_ARRAY_T>::operator[]( PEGASUS_ARRAY_T& Array<PEGASUS_ARRAY_T>::operator[](
     Uint32 index)     Uint32 index)
 { {
 #ifndef PEGASUS_ARRAY_NO_THROW  
     if (index >= Array_size)     if (index >= Array_size)
         ArrayThrowIndexOutOfBoundsException();         ArrayThrowIndexOutOfBoundsException();
 #endif  
  
     if (Array_refs.get() != 1)     if (Array_refs.get() != 1)
         _rep = ArrayRep<PEGASUS_ARRAY_T>::copy_on_write(Array_rep);         _rep = ArrayRep<PEGASUS_ARRAY_T>::copy_on_write(Array_rep);
Line 381 
Line 380 
 const PEGASUS_ARRAY_T& Array<PEGASUS_ARRAY_T>::operator[]( const PEGASUS_ARRAY_T& Array<PEGASUS_ARRAY_T>::operator[](
     Uint32 index) const     Uint32 index) const
 { {
 #ifndef PEGASUS_ARRAY_NO_THROW  
     if (index >= Array_size)     if (index >= Array_size)
         ArrayThrowIndexOutOfBoundsException();         ArrayThrowIndexOutOfBoundsException();
 #endif  
  
     return Array_data[index];     return Array_data[index];
 } }


Legend:
Removed from v.1.31.2.1  
changed lines
  Added in v.1.37.6.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2