oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/Cast: move OffsetPointer() to OffsetPointer.hxx

Browse Source
This commit is contained in:
Max Kellermann 2018-08-20 13:46:18 +02:00
parent ec373eba5d
commit edd9d16c84
3 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -513,6 +513,7 @@ libutil_a_SOURCES = \
src/util/Chrono.hxx \ src/util/Chrono.hxx \
src/util/Clamp.hxx \ src/util/Clamp.hxx \
src/util/DeleteDisposer.hxx \ src/util/DeleteDisposer.hxx \
src/util/OffsetPointer.hxx \
src/util/Alloc.cxx src/util/Alloc.hxx \ src/util/Alloc.cxx src/util/Alloc.hxx \
src/util/AllocatedArray.hxx \ src/util/AllocatedArray.hxx \
src/util/VarSize.hxx \ src/util/VarSize.hxx \

19
src/util/Cast.hxx
View File

@ -30,28 +30,11 @@
#ifndef CAST_HXX #ifndef CAST_HXX
#define CAST_HXX #define CAST_HXX
#include "OffsetPointer.hxx"
#include "Compiler.h" #include "Compiler.h"
#include <stddef.h> #include <stddef.h>
/**
* Offset the given pointer by the specified number of bytes.
*/
static inline constexpr void *
OffsetPointer(void *p, ptrdiff_t offset)
{
return (char *)p + offset;
}
/**
* Offset the given pointer by the specified number of bytes.
*/
static inline constexpr const void *
OffsetPointer(const void *p, ptrdiff_t offset)
{
return (const char *)p + offset;
}
template<typename T, typename U> template<typename T, typename U>
static inline constexpr T * static inline constexpr T *
OffsetCast(U *p, ptrdiff_t offset) OffsetCast(U *p, ptrdiff_t offset)

50
src/util/OffsetPointer.hxx Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (C) 2013-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#include <stddef.h>
/**
* Offset the given pointer by the specified number of bytes.
*/
static inline constexpr void *
OffsetPointer(void *p, ptrdiff_t offset)
{
return (char *)p + offset;
}
/**
* Offset the given pointer by the specified number of bytes.
*/
static inline constexpr const void *
OffsetPointer(const void *p, ptrdiff_t offset)
{
return (const char *)p + offset;
}