Commit 79fe8bc9 authored by Charles Leggett's avatar Charles Leggett
Browse files

Remove references to GCCXML

Fixes GAUDI-1202

See merge request !148
parents b639e65c 19843e48
......@@ -5,15 +5,9 @@
#include <string>
#ifndef __GCCXML__
#include <chrono>
typedef std::chrono::high_resolution_clock Clock;
typedef Clock::time_point time_point;
#else
typedef uint time_point;
#endif
#include <chrono>
typedef std::chrono::high_resolution_clock Clock;
typedef Clock::time_point time_point;
struct TimelineEvent{
uint thread;
......
......@@ -42,11 +42,11 @@ public:
catch (...) {}
}
StatusCode( IssueSeverity&& is) :
StatusCode( is.getLevel() == IssueSeverity::RECOVERABLE ?
StatusCode::RECOVERABLE :
( is.getLevel() < IssueSeverity::ERROR ?
StatusCode::SUCCESS :
StatusCode( IssueSeverity&& is) :
StatusCode( is.getLevel() == IssueSeverity::RECOVERABLE ?
StatusCode::RECOVERABLE :
( is.getLevel() < IssueSeverity::ERROR ?
StatusCode::SUCCESS :
StatusCode::FAILURE )
, std::move(is) ) { }
......@@ -58,13 +58,11 @@ public:
m_severity(rhs.m_severity)
{ rhs.m_checked = true; }
#ifndef __GCCXML__
/// Move constructor.
StatusCode( StatusCode&& rhs ) noexcept:
d_code(rhs.d_code), m_checked(rhs.m_checked),
m_severity( std::move(rhs.m_severity) )
{ rhs.m_checked = true; }
#endif
/// Destructor.
~StatusCode()
......
......@@ -853,11 +853,6 @@ macro_append cppflags "" \
no-hide-warnings "" \
target-clang " -Wno-overloaded-virtual -Wno-char-subscripts"
# FIXME: (MCl) gccmax is an alias to gcc47
macro_append gccxml_cppflags "" \
target-gccmax " -D__STRICT_ANSI__" \
target-gcc47 " -D__STRICT_ANSI__"
# ppcmd=-I can be used on Windows as on Linux
macro ppcmd "-I"
......@@ -1472,8 +1467,6 @@ apply_pattern doxy_vers_set external=COOL
apply_pattern doxy_vers_set external=CORAL
apply_pattern doxy_vers_set external=ROOT
apply_pattern doxy_vers_set external=Boost
apply_pattern doxy_vers_set external=uuid
apply_pattern doxy_vers_set external=GCCXML
apply_pattern doxy_vers_set external=AIDA
apply_pattern doxy_vers_set external=XercesC
apply_pattern doxy_vers_set external=GSL
......
......@@ -524,19 +524,6 @@ macro(gaudi_project project version)
# (so far, the build and the release envirnoments are identical)
set(project_build_environment ${project_environment})
# FIXME: this should not be needed, but there is a bug in genreflex
if(BINARY_TAG MATCHES "i686-.*")
# special environment variables for GCCXML
if(GCCXML_CXX_COMPILER)
set(project_build_environment ${project_build_environment}
SET GCCXML_COMPILER "${GCCXML_CXX_COMPILER}")
endif()
if(GCCXML_CXX_FLAGS)
set(project_build_environment ${project_build_environment}
SET GCCXML_CXXFLAGS "${GCCXML_CXX_FLAGS}")
endif()
endif()
# - collect internal environment
message(STATUS " environment for the project")
# - installation dirs
......@@ -2954,8 +2941,6 @@ macro(gaudi_external_project_environment)
endif()
elseif(pack STREQUAL "Oracle")
set(executable ${SQLPLUS_EXECUTABLE})
elseif(pack STREQUAL "GCCXML")
set(executable ${GCCXML})
elseif(pack STREQUAL "tcmalloc")
set(executable ${PPROF_EXECUTABLE})
endif()
......
......@@ -471,10 +471,6 @@ macro(lcg_prepare_paths)
endif()
endif()
if(LCG_COMP MATCHES "clang")
set(GCCXML_CXX_COMPILER g++ CACHE STRING "Compiler that GCCXML must use.")
endif()
# This is not really needed because Xerces has its own version macro, but it was
# added at some point, so it is kept for backward compatibility.
#add_definitions(-DXERCESC_GE_31)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment