Skip to content

Commit d82778c

Browse files
jacobwilliamsjacobwilliams
committed
fixed for ifort builds and updated VS project.
1 parent 9e61123 commit d82778c

File tree

2 files changed

+35
-25
lines changed

2 files changed

+35
-25
lines changed

‎src/json_value_module.F90

+23-12
Original file line numberDiff line numberDiff line change
@@ -296,16 +296,25 @@ module json_value_module
296296
json_get_string, MAYBEWRAP(json_get_string_with_path), &
297297
json_get_string_vec, MAYBEWRAP(json_get_string_vec_with_path), &
298298
json_get_array, MAYBEWRAP(json_get_array_with_path)
299+
procedure,private :: json_get_integer
300+
procedure,private :: json_get_integer_vec
301+
procedure,private :: json_get_double
302+
procedure,private :: json_get_double_vec
303+
procedure,private :: json_get_logical
304+
procedure,private :: json_get_logical_vec
305+
procedure,private :: json_get_string
306+
procedure,private :: json_get_string_vec
307+
procedure,private :: json_get_array
299308
procedure,private :: MAYBEWRAP(json_get_by_path)
300-
procedure,private :: json_get_integer,MAYBEWRAP(json_get_integer_with_path)
301-
procedure,private :: json_get_integer_vec,MAYBEWRAP(json_get_integer_vec_with_path)
302-
procedure,private :: json_get_double,MAYBEWRAP(json_get_double_with_path)
303-
procedure,private :: json_get_double_vec,MAYBEWRAP(json_get_double_vec_with_path)
304-
procedure,private :: json_get_logical,MAYBEWRAP(json_get_logical_with_path)
305-
procedure,private :: json_get_logical_vec,MAYBEWRAP(json_get_logical_vec_with_path)
306-
procedure,private :: json_get_string,MAYBEWRAP(json_get_string_with_path)
307-
procedure,private :: json_get_string_vec,MAYBEWRAP(json_get_string_vec_with_path)
308-
procedure,private :: json_get_array,MAYBEWRAP(json_get_array_with_path)
309+
procedure,private :: MAYBEWRAP(json_get_integer_with_path)
310+
procedure,private :: MAYBEWRAP(json_get_integer_vec_with_path)
311+
procedure,private :: MAYBEWRAP(json_get_double_with_path)
312+
procedure,private :: MAYBEWRAP(json_get_double_vec_with_path)
313+
procedure,private :: MAYBEWRAP(json_get_logical_with_path)
314+
procedure,private :: MAYBEWRAP(json_get_logical_vec_with_path)
315+
procedure,private :: MAYBEWRAP(json_get_string_with_path)
316+
procedure,private :: MAYBEWRAP(json_get_string_vec_with_path)
317+
procedure,private :: MAYBEWRAP(json_get_array_with_path)
309318

310319
procedure,public :: print_to_string => json_value_to_string !! Print the [[json_value]] structure to an allocatable string
311320

@@ -321,7 +330,8 @@ module json_value_module
321330
! call json%print(p,'test.json') !this is [[json_print_2]]
322331
!````
323332
generic,public :: print => json_print_1,json_print_2
324-
procedure :: json_print_1,json_print_2
333+
procedure :: json_print_1
334+
procedure :: json_print_2
325335

326336
!>
327337
! Destructor routine for a [[json_value]] pointer.
@@ -478,7 +488,8 @@ module json_value_module
478488
!>
479489
! Parse the JSON file and populate the [[json_value]] tree.
480490
generic,public :: parse => json_parse_file, MAYBEWRAP(json_parse_string)
481-
procedure :: json_parse_file, MAYBEWRAP(json_parse_string)
491+
procedure :: json_parse_file
492+
procedure :: MAYBEWRAP(json_parse_string)
482493

483494
!>
484495
! Throw an exception.
@@ -892,7 +903,7 @@ subroutine json_throw_exception(json,msg)
892903
write(*,'(A)') 'JSON-Fortran Exception: '//trim(msg)
893904
!call backtrace() ! gfortran (use -fbacktrace -fall-intrinsics flags)
894905
#ifdef __INTEL_COMPILER
895-
call tracebackqq(-1) ! print a traceback and return
906+
call tracebackqq(user_exit_code=-1) ! print a traceback and return
896907
#endif
897908
write(*,'(A)') '***********************'
898909
end if

‎visual_studio/jsonfortran.vfproj

+12-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Name="x64"/></Platforms>
66
<Configurations>
77
<Configuration Name="Debug|Win32" OutputDirectory="../lib/win32" ConfigurationType="typeStaticLibrary">
8-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" StandardWarnings="standardWarningsF08" Diagnostics="diagnosticsShowAll" WarnInterfaces="true" ModulePath="$(OutDir)\" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
8+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" StandardWarnings="standardWarningsF08" Diagnostics="diagnosticsShowAll" WarnInterfaces="true" ModulePath="$(OutDir)\" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
99
<Tool Name="VFLibrarianTool"/>
1010
<Tool Name="VFResourceCompilerTool"/>
1111
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
@@ -14,7 +14,7 @@
1414
<Tool Name="VFPreBuildEventTool"/>
1515
<Tool Name="VFPostBuildEventTool"/></Configuration>
1616
<Configuration Name="Release|Win32" OutputDirectory="../lib/win32" ConfigurationType="typeStaticLibrary">
17-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(OutDir)\" RuntimeLibrary="rtMultiThreadedDLL"/>
17+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" ModulePath="$(OutDir)\" RuntimeLibrary="rtMultiThreadedDLL"/>
1818
<Tool Name="VFLibrarianTool"/>
1919
<Tool Name="VFResourceCompilerTool"/>
2020
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
@@ -23,7 +23,7 @@
2323
<Tool Name="VFPreBuildEventTool"/>
2424
<Tool Name="VFPostBuildEventTool"/></Configuration>
2525
<Configuration Name="Debug|x64" ConfigurationType="typeStaticLibrary">
26-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" StandardWarnings="standardWarningsF08" Diagnostics="diagnosticsShowAll" WarnDeclarations="true" WarnUnusedVariables="true" WarnIgnoreLOC="true" WarnTruncateSource="true" WarnUncalled="true" WarnInterfaces="true" ModulePath="$(OutDir)\" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
26+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="../src" StandardWarnings="standardWarningsF08" Diagnostics="diagnosticsShowAll" WarnDeclarations="true" WarnUnusedVariables="true" WarnIgnoreLOC="true" WarnTruncateSource="true" WarnUncalled="true" WarnInterfaces="true" ModulePath="$(OutDir)\" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
2727
<Tool Name="VFLibrarianTool"/>
2828
<Tool Name="VFResourceCompilerTool"/>
2929
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
@@ -32,7 +32,7 @@
3232
<Tool Name="VFPreBuildEventTool"/>
3333
<Tool Name="VFPostBuildEventTool"/></Configuration>
3434
<Configuration Name="Release|x64" ConfigurationType="typeStaticLibrary">
35-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" ModulePath="$(OutDir)\" RuntimeLibrary="rtMultiThreadedDLL"/>
35+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" AdditionalIncludeDirectories="../src" ModulePath="$(OutDir)\" RuntimeLibrary="rtMultiThreadedDLL"/>
3636
<Tool Name="VFLibrarianTool"/>
3737
<Tool Name="VFResourceCompilerTool"/>
3838
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
@@ -41,14 +41,13 @@
4141
<Tool Name="VFPreBuildEventTool"/>
4242
<Tool Name="VFPostBuildEventTool"/></Configuration></Configurations>
4343
<Files>
44+
<Filter Name="include">
45+
<File RelativePath="..\src\json_macros.inc"/></Filter>
4446
<Filter Name="src" Filter="F90;f90;for;f;fpp;ftn;def;odl;idl">
45-
<File RelativePath="..\src\json_module.F90">
46-
<FileConfiguration Name="Debug|Win32">
47-
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
48-
<FileConfiguration Name="Release|x64">
49-
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
50-
<FileConfiguration Name="Debug|x64">
51-
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
52-
<FileConfiguration Name="Release|Win32">
53-
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File></Filter></Files>
47+
<File RelativePath="..\src\json_file_module.F90"/>
48+
<File RelativePath="..\src\json_kinds.F90"/>
49+
<File RelativePath="..\src\json_module.F90"/>
50+
<File RelativePath="..\src\json_parameters.F90"/>
51+
<File RelativePath="..\src\json_string_utilities.F90"/>
52+
<File RelativePath="..\src\json_value_module.F90"/></Filter></Files>
5453
<Globals/></VisualStudioProject>

0 commit comments

Comments
 (0)