am 8c4d3c08: am e7c94156: Merge "Remove DictContent." into lmp-dev

* commit '8c4d3c087547740d571683c538e91745b834c618':
  Remove DictContent.
main
Keisuke Kuroyanagi 2014-08-01 21:00:16 +00:00 committed by Android Git Automerger
commit 32df5db796
3 changed files with 2 additions and 39 deletions

View File

@ -1,35 +0,0 @@
/*
* Copyright (C) 2013, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LATINIME_DICT_CONTENT_H
#define LATINIME_DICT_CONTENT_H
#include "defines.h"
namespace latinime {
class DictContent {
public:
virtual ~DictContent() {}
protected:
DictContent() {}
private:
DISALLOW_COPY_AND_ASSIGN(DictContent);
};
} // namespace latinime
#endif /* LATINIME_DICT_CONTENT_H */

View File

@ -21,14 +21,13 @@
#include <cstdio>
#include "defines.h"
#include "suggest/policyimpl/dictionary/structure/v4/content/dict_content.h"
#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
namespace latinime {
class SingleDictContent : public DictContent {
class SingleDictContent {
public:
SingleDictContent(uint8_t *const buffer, const int bufferSize)
: mExpandableContentBuffer(buffer, bufferSize,

View File

@ -21,7 +21,6 @@
#include <cstdio>
#include "defines.h"
#include "suggest/policyimpl/dictionary/structure/v4/content/dict_content.h"
#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h"
#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
#include "suggest/policyimpl/dictionary/utils/sparse_table.h"
@ -29,7 +28,7 @@
namespace latinime {
// TODO: Support multiple contents.
class SparseTableDictContent : public DictContent {
class SparseTableDictContent {
public:
AK_FORCE_INLINE SparseTableDictContent(uint8_t *const *buffers, const int *bufferSizes,
const int sparseTableBlockSize, const int sparseTableDataSize)