Fix clang build

.travis.yml

@@ -43,33 +43,33 @@ matrix:
       addons: &gcc6
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libglib2.0-dev', 'qt4-qmake', 'libqt4-dev', 'libantlr3c-dev', 'libboost-system-dev', 'libboost-filesystem-dev', 'libboost-program-options-dev', 'libboost-regex-dev', 'libboost-python-dev', 'python3-dev', 'python3', 'make', 'cmake', 'antlr', 'antlr3', 'libhiredis-dev', 'gcc', 'g++', 'qtbase5-dev', 'llvm', 'libcurl4-openssl-dev', 'libclang-dev', 'libboost-regex-dev', 'ccache']
+          packages: ['g++-6', 'libglib2.0-dev', 'qt4-qmake', 'libqt4-dev', 'libantlr3c-dev', 'libboost-system-dev', 'libboost-filesystem-dev', 'libboost-program-options-dev', 'libboost-regex-dev', 'libboost-python-dev', 'python3-dev', 'python3', 'make', 'cmake', 'antlr', 'antlr3', 'libhiredis-dev', 'qtbase5-dev', 'llvm', 'libcurl4-openssl-dev', 'libclang-dev', 'libboost-regex-dev', 'ccache']
       env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug'
 
-    - os: linux
-      compiler: "clang-3.8-debug"
-      addons: &clang38
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libglib2.0-dev', 'qt4-qmake', 'libqt4-dev', 'libantlr3c-dev', 'libboost-system-dev', 'libboost-filesystem-dev', 'libboost-program-options-dev', 'libboost-regex-dev', 'libboost-python-dev', 'python3-dev', 'python3', 'make', 'cmake', 'antlr', 'antlr3', 'libhiredis-dev', 'gcc', 'g++', 'qtbase5-dev', 'llvm', 'libcurl4-openssl-dev', 'libclang-dev', 'libboost-regex-dev', 'ccache']
-      env: CLANG_VERSION='3.8.0' BUILD_TYPE='Debug' #RUN_CLANG_FORMAT=ON
+    # - os: linux
+    #   compiler: "clang-3.9-debug"
+    #   addons: &clang38
+    #     apt:
+    #       sources: ['ubuntu-toolchain-r-test']
+    #       packages: ['libstdc++-4.9-dev', 'clang-3.9', 'libglib2.0-dev', 'qt4-qmake', 'libqt4-dev', 'libantlr3c-dev', 'libboost-system-dev', 'libboost-filesystem-dev', 'libboost-program-options-dev', 'libboost-regex-dev', 'libboost-python-dev', 'python3-dev', 'python3', 'make', 'cmake', 'antlr', 'antlr3', 'libhiredis-dev', 'qtbase5-dev', 'llvm', 'libcurl4-openssl-dev', 'libclang-3.9-dev', 'libclang1-3.9', 'libboost-regex-dev', 'ccache']
+    #   env: CCOMPILER='clang' CXXCOMPILER='clang++' CLANG_VERSION='3.9.0' BUILD_TYPE='Debug'
 
     # Release Builds
     - os: linux
       compiler: "gcc-6-release"
       addons: &gcc6
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libglib2.0-dev', 'qt4-qmake', 'libqt4-dev', 'libantlr3c-dev', 'libboost-system-dev', 'libboost-filesystem-dev', 'libboost-program-options-dev', 'libboost-regex-dev', 'libboost-python-dev', 'python3-dev', 'python3', 'make', 'cmake', 'antlr', 'antlr3', 'libhiredis-dev', 'gcc', 'g++', 'qtbase5-dev', 'llvm', 'libcurl4-openssl-dev', 'libclang-dev', 'libboost-regex-dev', 'ccache']
+          packages: ['g++-6', 'libglib2.0-dev', 'qt4-qmake', 'libqt4-dev', 'libantlr3c-dev', 'libboost-system-dev', 'libboost-filesystem-dev', 'libboost-program-options-dev', 'libboost-regex-dev', 'libboost-python-dev', 'python3-dev', 'python3', 'make', 'cmake', 'antlr', 'antlr3', 'libhiredis-dev', 'qtbase5-dev', 'llvm', 'libcurl4-openssl-dev', 'libclang-dev', 'libboost-regex-dev', 'ccache']
       env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'
 
-    - os: linux
-      compiler: "clang-3.8-release"
-      addons: &clang38
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libglib2.0-dev', 'qt4-qmake', 'libqt4-dev', 'libantlr3c-dev', 'libboost-system-dev', 'libboost-filesystem-dev', 'libboost-program-options-dev', 'libboost-regex-dev', 'libboost-python-dev', 'python3-dev', 'python3', 'make', 'cmake', 'antlr', 'antlr3', 'libhiredis-dev', 'gcc', 'g++', 'qtbase5-dev', 'llvm', 'libcurl4-openssl-dev', 'libclang-dev', 'libboost-regex-dev', 'ccache']
-      env: CLANG_VERSION='3.8.0' BUILD_TYPE='Release' #RUN_CLANG_FORMAT=ON
+    # - os: linux
+    #   compiler: "clang-3.9-release"
+    #   addons: &clang38
+    #     apt:
+    #       sources: ['ubuntu-toolchain-r-test']
+    #       packages: ['libstdc++-4.9-dev', 'clang-3.9', 'libglib2.0-dev', 'qt4-qmake', 'libqt4-dev', 'libantlr3c-dev', 'libboost-system-dev', 'libboost-filesystem-dev', 'libboost-program-options-dev', 'libboost-regex-dev', 'libboost-python-dev', 'python3-dev', 'python3', 'make', 'cmake', 'antlr', 'antlr3', 'libhiredis-dev', 'qtbase5-dev', 'llvm', 'libcurl4-openssl-dev', 'libclang-3.9-dev', 'libclang1-3.9', 'libboost-regex-dev', 'ccache']
+    #   env: CCOMPILER='clang' CXXCOMPILER='clang++' CLANG_VERSION='3.9.0' BUILD_TYPE='Release'
 
 before_install:
   - if [[ $(uname -s) == 'Darwin' ]]; then sudo mdutil -i off /; fi;
@@ -80,7 +80,7 @@ install:
   - mkdir build && pushd build
   - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
   - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_CCACHE=ON -DSC_AUTO_TEST=ON -DSC_KPM_SCP=OFF
-  - echo "travis_fold:start:MAKE"
+  - echo "travis_fold:start:MAKE"\
   - make --jobs=${JOBS}
   - echo "travis_fold:end:MAKE"
   - ccache -s

CMakeLists.txt

@@ -39,15 +39,25 @@ endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 
 set(SC_MEMORY_SRC "${SC_MACHINE_ROOT}/sc-memory")
 
-if(CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics -std=c++14")
+    set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
+    if(${SC_AUTO_TEST})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdeprecated-declarations")
+    endif()
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    set(CMAKE_CXX_FLAGS "-std=c++14 -Wall")
     set(CMAKE_CXX_FLAGS_RELEASE "-O3")        ## Optimize
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s")  ## Strip binary
 endif()
 
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSC_DEBUG -DSC_PROFILE")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSC_DEBUG -DSC_PROFILE")
 
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+
 if (${SC_AUTO_TEST})
     add_definitions(-DSC_BUILD_AUTO_TESTS)
 endif()
@@ -83,16 +93,16 @@ if (${UNIX})
     endif ()
 
     pkg_check_modules(LIBCURL REQUIRED libcurl)
+
+    message (${LIBCLANG_LIBRARIES})
 
     include_directories("${SC_MACHINE_THIRDPARTY_PATH}"
                         "${SC_MACHINE_ANTRL_DIR}/cpp")
 
     add_definitions(-DSC_PLATFORM_UNIX)
 
     # for std::thread support
-    if (${CMAKE_COMPILER_IS_GNUCXX})
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-    endif()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 
 elseif (${WIN32})
     find_package(PythonLibs 3.6 REQUIRED)
@@ -202,16 +212,4 @@ add_subdirectory(${SC_MACHINE_ROOT}/sc-kpm)
 add_subdirectory(${SC_MACHINE_ROOT}/sc-network)
 add_subdirectory(${SC_MACHINE_ROOT}/tools)
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL Windows)
-    if(MSVC)
-        message(STATUS "Compiler: MSVC, version: " ${MSVC_VERSION})
-    endif(MSVC)
-    if(BORLAND) 
-        message(STATUS "Compiler: BCC") 
-    endif(BORLAND) 
-    else(${CMAKE_SYSTEM_NAME} STREQUAL Linux) 
-        message(STATUS "Only GCC is supported on Linux")
-    endif(${CMAKE_SYSTEM_NAME} STREQUAL Windows) 
-
-message(STATUS "CMake generates " ${CMAKE_GENERATOR})
 

sc-memory/cpp/sc_template.cpp

@@ -9,6 +9,28 @@
 
 #include <algorithm>
 
+ScTemplateItemValue operator >> (ScAddr const & value, char const * replName)
+{
+  return ScTemplateItemValue(value, replName);
+}
+
+ScTemplateItemValue operator >> (ScAddr const & value, std::string const & replName)
+{
+  return ScTemplateItemValue(value, replName.c_str());
+}
+
+ScTemplateItemValue operator >> (ScType const & value, char const * replName)
+{
+  return ScTemplateItemValue(value, replName);
+}
+
+ScTemplateItemValue operator >> (ScType const & value, std::string const & replName)
+{
+  return ScTemplateItemValue(value, replName.c_str());
+}
+
+// --------------------------------
+
 ScTemplate::ScTemplate(bool forceOrder /* = true */)
   : m_currentReplPos(0)
   , m_isForceOrder(forceOrder)

sc-memory/cpp/sc_template.hpp

@@ -183,17 +183,10 @@ class ScTemplateConstr3
   size_t m_index;
 };
 
-template <typename Type>
-ScTemplateItemValue operator >> (Type const & value, char const * replName)
-{
-  return ScTemplateItemValue(value, replName);
-}
-
-template <typename Type>
-ScTemplateItemValue operator >> (Type const & value, std::string const & replName)
-{
-  return ScTemplateItemValue(value, replName.c_str());
-}
+ScTemplateItemValue operator >> (ScAddr const & value, char const * replName);
+ScTemplateItemValue operator >> (ScAddr const & value, std::string const & replName);
+ScTemplateItemValue operator >> (ScType const & value, char const * replName);
+ScTemplateItemValue operator >> (ScType const & value, std::string const & replName);
 
 class ScTemplateGenResult;
 class ScTemplateSearchResult;

sc-memory/sc-store/sc_defines.h

@@ -71,13 +71,6 @@
 
 #	define _SC_DEPRECATED_IMPL(__Version, __Message) __attribute__((deprecated(__Message "Update you code to newest API version " #__Version " or later.")))
 
-#	define PRAGMA_DISABLE_DEPRECATION_WARNINGS \
-  _Pragma ("clang diagnostic push") \
-  _Pragma ("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-
-#	define PRAGMA_ENABLE_DEPRECATION_WARNINGS
-_Pragma("clang diagnostic pop")
-
 #elif (SC_COMPILER == SC_COMPILER_GNU)
 # define _SC_DEPRECATED_IMPL(__Version, __Message)
 #else

tools/codegen/Parser/LanguageTypes/Class.cpp

@@ -177,8 +177,8 @@ void Class::GenerateCode(std::string const & fileId, std::stringstream & outCode
   GenerateImpl(outCode);
 }
 
-#define _GENERATE_INIT_CODE(FuncName, Method, Modifier) \
-  outCode << Modifier << " bool " << FuncName << "() \\\n{ \\\n"; \
+#define _GENERATE_INIT_CODE(FuncName, Method, PreModifier, PostModifier) \
+  outCode << PreModifier << " bool " << FuncName << "() " << PostModifier << " \\\n{ \\\n"; \
   outCode << "    ScMemoryContext ctx(sc_access_lvl_make_min, \"" << m_name << "::" << FuncName << "\"); \\\n"; \
   outCode << "    bool result = true; \\\n"; \
   Method(outCode); \
@@ -187,12 +187,12 @@ void Class::GenerateCode(std::string const & fileId, std::stringstream & outCode
 
 void Class::GenerateCodeInit(std::stringstream & outCode) const
 {
-  _GENERATE_INIT_CODE("_InitInternal", GenerateFieldsInitCode, "")
+  _GENERATE_INIT_CODE("_InitInternal", GenerateFieldsInitCode, "", "override")
 }
 
 void Class::GenerateCodeStaticInit(std::stringstream & outCode) const
 {
-  _GENERATE_INIT_CODE("_InitStaticInternal", GenerateStaticFieldsInitCode, "static")
+  _GENERATE_INIT_CODE("_InitStaticInternal", GenerateStaticFieldsInitCode, "static", "")
 }
 
 void Class::GenerateFieldsInitCode(std::stringstream & outCode) const
@@ -250,7 +250,7 @@ void Class::GenerateDeclarations(std::stringstream & outCode) const
 
     if (isActionAgent)
     {
-      outCode << "\\\n\tvirtual sc_result RunImpl(ScAddr const & requestAddr, ScAddr const & resultAddr); ";
+      outCode << "\\\n\tvirtual sc_result RunImpl(ScAddr const & requestAddr, ScAddr const & resultAddr) override; ";
       listenAddr = "GetCommandInitiatedAddr()";
       eventType = "ScEvent::Type::AddOutputEdge";
       instConstructParams = "ms_cmdClass_" + m_displayName + ", ";