From f95f654d787581592af92ec7204e4eb7ecdfbc2f Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Wed, 22 Jul 2015 13:55:15 +0100 Subject: [PATCH] Cleanup dead declaration from ShaderEffect Change-Id: I96e27dd7692fcd828a15f4f1900fe9b6865c2788 --- dali/internal/render/shaders/scene-graph-shader.cpp | 2 +- dali/internal/render/shaders/scene-graph-shader.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dali/internal/render/shaders/scene-graph-shader.cpp b/dali/internal/render/shaders/scene-graph-shader.cpp index 913a071..fb6e1f1 100644 --- a/dali/internal/render/shaders/scene-graph-shader.cpp +++ b/dali/internal/render/shaders/scene-graph-shader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/dali/internal/render/shaders/scene-graph-shader.h b/dali/internal/render/shaders/scene-graph-shader.h index 198b557..8c8bd73 100644 --- a/dali/internal/render/shaders/scene-graph-shader.h +++ b/dali/internal/render/shaders/scene-graph-shader.h @@ -2,7 +2,7 @@ #define __DALI_INTERNAL_SCENE_GRAPH_SHADER_H__ /* - * Copyright (c) 2014-2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,11 +40,6 @@ namespace Dali { -namespace Integration -{ -typedef unsigned int ResourceId; -} // namespace Integration - namespace Internal { -- 2.7.4