Browse Source

Removed long-deprecated Query.h header.

Use PrimitiveQuery.h, SampleQuery.h or TimeQuery.h instead.
pull/231/head
Vladimír Vondruš 8 years ago
parent
commit
a4ed4dc35a
  1. 5
      src/Magnum/CMakeLists.txt
  2. 47
      src/Magnum/Query.h

5
src/Magnum/CMakeLists.txt

@ -205,11 +205,6 @@ if(NOT (TARGET_WEBGL AND TARGET_GLES2))
list(APPEND Magnum_PRIVATE_HEADERS list(APPEND Magnum_PRIVATE_HEADERS
Implementation/QueryState.h) Implementation/QueryState.h)
if(BUILD_DEPRECATED)
list(APPEND Magnum_HEADERS
Query.h)
endif()
endif() endif()
# Link in GL function pointer variables on platforms that support it # Link in GL function pointer variables on platforms that support it

47
src/Magnum/Query.h

@ -1,47 +0,0 @@
#ifndef Magnum_Query_h
#define Magnum_Query_h
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of 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.
*/
/** @file
* @deprecated Use @ref Magnum/PrimitiveQuery.h, @ref Magnum/SampleQuery.h or @ref Magnum/TimeQuery.h instead.
*/
#include "Magnum/configure.h"
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
#ifdef MAGNUM_BUILD_DEPRECATED
#include "Magnum/PrimitiveQuery.h"
#include "Magnum/SampleQuery.h"
#include "Magnum/TimeQuery.h"
CORRADE_DEPRECATED_FILE("use Magnum/PrimitiveQuery.h, Magnum/SampleQuery.h or Magnum/TimeQuery.h instead")
#else
#error use Magnum/PrimitiveQuery.h, Magnum/SampleQuery.h or Magnum/TimeQuery.h instead
#endif
#else
#error this header is not available in WebGL 1.0 build
#endif
#endif
Loading…
Cancel
Save