From 54c2eae4b492d972b251fed0d632ebafe0e47ca8 Mon Sep 17 00:00:00 2001 From: MosesAdmin Date: Wed, 15 Feb 2017 11:03:23 +0000 Subject: [PATCH] daily automatic beautifier --- moses2/FF/LexicalReordering/LexicalReordering.cpp | 12 ++++++------ moses2/MemPoolAllocator.h | 2 +- moses2/TranslationModel/CompactPT/MmapAllocator.h | 2 +- moses2/TranslationModel/ProbingPT/storing.cpp | 2 +- moses2/legacy/ThreadPool.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/moses2/FF/LexicalReordering/LexicalReordering.cpp b/moses2/FF/LexicalReordering/LexicalReordering.cpp index c84b30a59..6f510574c 100644 --- a/moses2/FF/LexicalReordering/LexicalReordering.cpp +++ b/moses2/FF/LexicalReordering/LexicalReordering.cpp @@ -34,13 +34,13 @@ namespace Moses2 /////////////////////////////////////////////////////////////////////// LexicalReordering::LexicalReordering(size_t startInd, const std::string &line) -: StatefulFeatureFunction(startInd, line) -, m_blank(NULL) -, m_propertyInd(-1) -, m_coll(NULL) -, m_configuration(NULL) + : StatefulFeatureFunction(startInd, line) + , m_blank(NULL) + , m_propertyInd(-1) + , m_coll(NULL) + , m_configuration(NULL) #ifdef HAVE_CMPH -, m_compactModel(NULL) + , m_compactModel(NULL) #endif { ReadParameters(); diff --git a/moses2/MemPoolAllocator.h b/moses2/MemPoolAllocator.h index 8076338b6..994bb7711 100644 --- a/moses2/MemPoolAllocator.h +++ b/moses2/MemPoolAllocator.h @@ -73,7 +73,7 @@ public: } MemPoolAllocator& operator=(const MemPoolAllocator& allocator) { - return *this; + return *this; } MemPool &m_pool; diff --git a/moses2/TranslationModel/CompactPT/MmapAllocator.h b/moses2/TranslationModel/CompactPT/MmapAllocator.h index c2923cad5..09ba58d93 100644 --- a/moses2/TranslationModel/CompactPT/MmapAllocator.h +++ b/moses2/TranslationModel/CompactPT/MmapAllocator.h @@ -131,7 +131,7 @@ public: if (!m_fixed) { size_t read = 0; #ifdef _WIN32 - read += _chsize_s(m_file_desc, m_map_size); + read += _chsize_s(m_file_desc, m_map_size); #else read += ftruncate(m_file_desc, m_map_size); #endif diff --git a/moses2/TranslationModel/ProbingPT/storing.cpp b/moses2/TranslationModel/ProbingPT/storing.cpp index 862aab3e8..ff26bc72b 100644 --- a/moses2/TranslationModel/ProbingPT/storing.cpp +++ b/moses2/TranslationModel/ProbingPT/storing.cpp @@ -68,7 +68,7 @@ void createProbingPT(const std::string &phrasetable_path, bool log_prob, int max_cache_size, bool scfg) { #if defined(_WIN32) || defined(_WIN64) - std::cerr << "Create not implemented for Windows" << std::endl; + std::cerr << "Create not implemented for Windows" << std::endl; #else std::cerr << "Starting..." << std::endl; diff --git a/moses2/legacy/ThreadPool.cpp b/moses2/legacy/ThreadPool.cpp index 2e5c48e36..5610f2935 100644 --- a/moses2/legacy/ThreadPool.cpp +++ b/moses2/legacy/ThreadPool.cpp @@ -40,7 +40,7 @@ namespace Moses2 ThreadPool::ThreadPool(size_t numThreads, int cpuAffinityOffset, int cpuAffinityIncr) : - m_stopped(false), m_stopping(false), m_queueLimit(0) + m_stopped(false), m_stopping(false), m_queueLimit(0) { //size_t numCPU = sysconf(_SC_NPROCESSORS_ONLN); size_t numCPU = std::thread::hardware_concurrency();