clover/core: Remove compiler.hpp.

header_map was the only definition left in compiler.hpp, move it into
program.hpp which is its only user in clover/core.

Reviewed-by: Serge Martin <edb+mesa@sigluy.net>
Tested-by: Jan Vesely <jan.vesely@rutgers.edu>
This commit is contained in:
Francisco Jerez 2016-05-17 16:03:17 +02:00
parent c2e37fe1f9
commit 9c7cda2792
4 changed files with 3 additions and 37 deletions

View File

@ -13,7 +13,6 @@ CPP_SOURCES := \
api/sampler.cpp \
api/transfer.cpp \
api/util.hpp \
core/compiler.hpp \
core/context.cpp \
core/context.hpp \
core/device.cpp \

View File

@ -1,34 +0,0 @@
//
// Copyright 2012 Francisco Jerez
//
// 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.
//
#ifndef CLOVER_CORE_COMPILER_HPP
#define CLOVER_CORE_COMPILER_HPP
#include "core/error.hpp"
#include "core/module.hpp"
#include "pipe/p_defines.h"
namespace clover {
typedef std::vector<std::pair<std::string, std::string> > header_map;
}
#endif

View File

@ -28,9 +28,10 @@
#include "core/object.hpp"
#include "core/context.hpp"
#include "core/module.hpp"
#include "core/compiler.hpp"
namespace clover {
typedef std::vector<std::pair<std::string, std::string>> header_map;
class program : public ref_counter, public _cl_program {
private:
typedef adaptor_range<

View File

@ -23,9 +23,9 @@
#ifndef CLOVER_LLVM_INVOCATION_HPP
#define CLOVER_LLVM_INVOCATION_HPP
#include "core/compiler.hpp"
#include "core/error.hpp"
#include "core/module.hpp"
#include "core/program.hpp"
#include "pipe/p_defines.h"
namespace clover {