am 2c7e97dc: Merge "Create suggest/core/result directory."

* commit '2c7e97dcdd2201a26b16b81f9d7fe6fcf8d49262':
  Create suggest/core/result directory.
main
Keisuke Kuroyanagi 2014-03-05 23:34:17 -08:00 committed by Android Git Automerger
commit f0922a9194
4 changed files with 3 additions and 3 deletions

View File

@ -32,7 +32,6 @@ LATIN_IME_CORE_SRC_FILES := \
digraph_utils.cpp \
error_type_utils.cpp \
multi_bigram_map.cpp \
suggestions_output_utils.cpp \
word_property.cpp) \
$(addprefix suggest/core/layout/, \
additional_proximity_chars.cpp \
@ -41,6 +40,7 @@ LATIN_IME_CORE_SRC_FILES := \
proximity_info_state.cpp \
proximity_info_state_utils.cpp) \
suggest/core/policy/weighting.cpp \
suggest/core/result/suggestions_output_utils.cpp \
suggest/core/session/dic_traverse_session.cpp \
$(addprefix suggest/policyimpl/dictionary/, \
header/header_policy.cpp \

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "suggest/core/dictionary/suggestions_output_utils.h"
#include "suggest/core/result/suggestions_output_utils.h"
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_utils.h"

View File

@ -21,11 +21,11 @@
#include "suggest/core/dicnode/dic_node_vector.h"
#include "suggest/core/dictionary/dictionary.h"
#include "suggest/core/dictionary/digraph_utils.h"
#include "suggest/core/dictionary/suggestions_output_utils.h"
#include "suggest/core/layout/proximity_info.h"
#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
#include "suggest/core/policy/traversal.h"
#include "suggest/core/policy/weighting.h"
#include "suggest/core/result/suggestions_output_utils.h"
#include "suggest/core/session/dic_traverse_session.h"
namespace latinime {