Browse Source

Doxygen warning fixes.

pull/197/head
Vladimír Vondruš 9 years ago
parent
commit
2b34c269db
  1. 4
      src/Magnum/Platform/ScreenedApplication.h
  2. 4
      src/Magnum/Shaders/AbstractVector.h

4
src/Magnum/Platform/ScreenedApplication.h

@ -124,8 +124,8 @@ template<class Application> class BasicScreenedApplication: public Application,
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief BasicScreenedApplication(const Arguments&, NoCreateT)
* @deprecated Use @ref BasicScreenedApplication(const Arguments&, NoCreateT) instead.
* @copybrief BasicScreenedApplication(const typename Application::Arguments&, NoCreateT)
* @deprecated Use @ref BasicScreenedApplication(const typename Application::Arguments&, NoCreateT) instead.
*/
CORRADE_DEPRECATED("use BasicScreenedApplication(const Arguments&, NoCreateT) instead") explicit BasicScreenedApplication(const typename Application::Arguments& arguments, std::nullptr_t): BasicScreenedApplication{arguments, NoCreate} {}
#endif

4
src/Magnum/Shaders/AbstractVector.h

@ -63,7 +63,11 @@ template<UnsignedInt dimensions> class AbstractVector: public AbstractShaderProg
*/
AbstractVector<dimensions>& setVectorTexture(Texture2D& texture);
#ifndef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private:
#endif
enum: Int { VectorTextureLayer = 15 };
explicit AbstractVector(NoCreateT) noexcept: AbstractShaderProgram{NoCreate} {}

Loading…
Cancel
Save