Procházet zdrojové kódy

Merge #8850: Implement (begin|end)_ptr in C++11 and add deprecation comment

f00705a serialize: Deprecate `begin_ptr` / `end_ptr` (Wladimir J. van der Laan)
47314e6 prevector: add C++11-like data() method (Wladimir J. van der Laan)
tags/v0.15.1
Wladimir J. van der Laan před 4 roky
rodič
revize
7dce175f5d
Žádný účet není propojen s e-mailovou adresou tvůrce revize
2 změnil soubory, kde provedl 18 přidání a 11 odebrání
  1. 8
    0
      src/prevector.h
  2. 10
    11
      src/serialize.h

+ 8
- 0
src/prevector.h Zobrazit soubor

@@ -475,6 +475,14 @@ public:
return ((size_t)(sizeof(T))) * _union.capacity;
}
}

value_type* data() {
return item_ptr(0);
}

const value_type* data() const {
return item_ptr(0);
}
};
#pragma pack(pop)


+ 10
- 11
src/serialize.h Zobrazit soubor

@@ -44,33 +44,32 @@ inline T* NCONST_PTR(const T* val)
return const_cast<T*>(val);
}

/**
* Get begin pointer of vector (non-const version).
* @note These functions avoid the undefined case of indexing into an empty
* vector, as well as that of indexing after the end of the vector.
/**
* Important: Do not use the following functions in new code, but use v.data()
* and v.data() + v.size() respectively directly. They were once introduced to
* have a compatible, safe way to get the begin and end pointer of a vector.
* However with C++11 the language has built-in functionality for this and it's
* more readable to just use that.
*/
template <typename V>
inline typename V::value_type* begin_ptr(V& v)
{
return v.empty() ? NULL : &v[0];
return v.data();
}
/** Get begin pointer of vector (const version) */
template <typename V>
inline const typename V::value_type* begin_ptr(const V& v)
{
return v.empty() ? NULL : &v[0];
return v.data();
}
/** Get end pointer of vector (non-const version) */
template <typename V>
inline typename V::value_type* end_ptr(V& v)
{
return v.empty() ? NULL : (&v[0] + v.size());
return v.data() + v.size();
}
/** Get end pointer of vector (const version) */
template <typename V>
inline const typename V::value_type* end_ptr(const V& v)
{
return v.empty() ? NULL : (&v[0] + v.size());
return v.data() + v.size();
}

/*

Načítá se…
Zrušit
Uložit