Skip to content

Commit

Permalink
Clean preprocessing stuff for intel compiler
Browse files Browse the repository at this point in the history
Clean preprocessing stuff for intel compiler: Intel compiler 19.1.0.075
compiles this version without any preprocessing flags, the compiler
issure about overloaded operators seems to be fixed.

Why:

*

This change addresses the need by:

*

Side effects:

*
  • Loading branch information
szaghi committed Sep 13, 2019
1 parent 65ee6d7 commit 5d603aa
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 36 deletions.
14 changes: 4 additions & 10 deletions fobos
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ modes = tests-gnu tests-gnu-debug
stringifor-static-intel stringifor-shared-intel

[common-variables]
$CSHARED_GNU = -c -fPIC -frealloc-lhs
$CSHARED_INT = -c -fpic -assume realloc_lhs
$CSHARED_GNU = -c -fPIC -frealloc-lhs -std=f2008 -fall-intrinsics
$CSHARED_INT = -c -fPIC -assume realloc_lhs -standard-semantics -std08
$LSHARED = -shared
$CSTATIC_GNU = -c -frealloc-lhs -std=f2008 -fall-intrinsics
$CSTATIC_INT = -c -assume realloc_lhs -standard-semantics -std08
Expand Down Expand Up @@ -40,7 +40,7 @@ output = libstringifor.a
mklib = static

[stringifor-shared-gnu]
template = template-static-gnu
template = template-shared-gnu
build_dir = lib
target = stringifor.F90
output = libstringifor.so
Expand All @@ -54,7 +54,7 @@ output = libstringifor.a
mklib = static

[stringifor-shared-intel]
template = template-static-intel
template = template-shared-intel
build_dir = lib
target = stringifor.F90
output = libstringifor.so
Expand All @@ -72,7 +72,6 @@ colors = True
quiet = False
log = True
jobs = 10
preproc = -D_R16P_SUPPORTED

[template-static-gnu-debug]
compiler = gnu
Expand All @@ -85,7 +84,6 @@ colors = True
quiet = False
log = True
jobs = 10
preproc = -D_R16P_SUPPORTED

[template-shared-gnu]
compiler = gnu
Expand All @@ -98,7 +96,6 @@ colors = True
quiet = False
log = True
jobs = 10
preproc = -D_R16P_SUPPORTED

[template-static-intel]
compiler = intel
Expand All @@ -111,7 +108,6 @@ colors = True
quiet = False
log = True
jobs = 10
preproc = -D_R16P_SUPPORTED

[template-static-intel-debug]
compiler = intel
Expand All @@ -124,7 +120,6 @@ colors = True
quiet = False
log = True
jobs = 10
preproc = -D_R16P_SUPPORTED

[template-shared-intel]
compiler = intel
Expand All @@ -137,7 +132,6 @@ colors = True
quiet = False
log = True
jobs = 10
preproc = -D_R16P_SUPPORTED

# rules
[rule-makedoc]
Expand Down
8 changes: 0 additions & 8 deletions src/lib/stringifor.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ module stringifor
use penf, only : I1P, I2P, I4P, I8P, R4P, R8P, R16P
! use stringifor_string_t, only : adjustl, adjustr, count, index, len, len_trim, repeat, scan, trim, verify, CK, string
use stringifor_string_t, only : adjustl, adjustr, count, index, len_trim, repeat, scan, trim, verify, CK, string
#ifndef __GFORTRAN__
use stringifor_string_t, only : assignment(=), operator(//), operator(.cat.), operator(==), &
operator(/=), operator(<), operator(<=), operator(>=), operator(>)
#endif

implicit none
private
Expand All @@ -19,10 +15,6 @@ module stringifor
! expose StingiFor overloaded builtins and operators
! public :: adjustl, adjustr, count, index, len, len_trim, repeat, scan, trim, verify
public :: adjustl, adjustr, count, index, len_trim, repeat, scan, trim, verify
#ifndef __GFORTRAN__
public :: assignment(=), operator(//), operator(.cat.), operator(==), &
operator(/=), operator(<), operator(<=), operator(>=), operator(>)
#endif
! expose StingiFor new procedures
public :: read_file, read_lines, write_file, write_lines
! expose PENF kinds
Expand Down
16 changes: 0 additions & 16 deletions src/lib/stringifor_string_t.F90
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ module stringifor_string_t
! expose StingiFor overloaded builtins and operators
! public :: adjustl, adjustr, count, index, len, len_trim, repeat, scan, trim, verify
public :: adjustl, adjustr, count, index, len_trim, repeat, scan, trim, verify
#if !(__GNUC__ < 7)
public :: assignment(=), operator(//), operator(.cat.), operator(==), &
operator(/=), operator(<), operator(<=), operator(>=), operator(>)
#endif
! expose StingiFor objects
public :: CK
public :: string
Expand Down Expand Up @@ -85,12 +81,8 @@ module stringifor_string_t
to_integer_I4P,&
to_integer_I8P,&
to_real_R4P, &
#ifdef _R16P_SUPPORTED
to_real_R8P, &
to_real_R16P !< Cast string to number.
#else
to_real_R8P !< Cast string to number.
#endif
procedure, pass(self) :: unescape !< Unescape double backslashes (or custom escaped character).
procedure, pass(self) :: unique !< Reduce to one (unique) multiple occurrences of a substring into a string.
procedure, pass(self) :: upper !< Return a string with all uppercase characters.
Expand All @@ -115,12 +107,8 @@ module stringifor_string_t
string_assign_integer_I4P, &
string_assign_integer_I8P, &
string_assign_real_R4P, &
#ifdef _R16P_SUPPORTED
string_assign_real_R8P, &
string_assign_real_R16P !< Assignment operator overloading.
#else
string_assign_real_R8P !< Assignment operator overloading.
#endif
generic :: operator(//) => string_concat_string, &
string_concat_character, &
character_concat_string !< Concatenation operator overloading.
Expand Down Expand Up @@ -250,11 +238,7 @@ module stringifor_string_t
!< Builtin = overloading.
module procedure string_assign_string, string_assign_character, string_assign_integer_I1P, string_assign_integer_I2P, &
string_assign_integer_I4P, string_assign_integer_I8P, string_assign_real_R4P, &
#ifdef _R16P_SUPPORTED
string_assign_real_R8P, string_assign_real_R16P
#else
string_assign_real_R8P
#endif
endinterface
interface operator(==)
!< Builtin == overloading.
Expand Down
2 changes: 1 addition & 1 deletion src/third_party/BeFoR64
2 changes: 1 addition & 1 deletion src/third_party/PENF

0 comments on commit 5d603aa

Please sign in to comment.