Merge pull request #145 from JGCRI/rc1.1.3

Rc1.1.3
JGCRI · Feb 23, 2016 · 7f87172 · 7f87172
2 parents bf6499f + af19e2f
commit 7f87172
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/project_files/VS/hector-lib.vcxproj b/project_files/VS/hector-lib.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -104,26 +104,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/project_files/VS/hector.vcxproj b/project_files/VS/hector.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -35,26 +35,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -79,22 +79,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>..\..\libs\gsl;..\..\libs\boost-lib;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\libs\gsl\Debug;$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\..\libs\gsl\Debug;..\..\libs\boost-lib\stage\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>..\..\libs\gsl;..\..\libs\boost-lib;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\libs\gsl\Debug;$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\..\libs\gsl\Debug;..\..\libs\boost-lib\stage\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>..\..\libs\gsl;..\..\libs\boost-lib;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\libs\gsl\Release;$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\..\libs\gsl\Release;..\..\libs\boost-lib\stage\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>..\..\libs\gsl;..\..\libs\boost-lib;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\libs\gsl\Release;$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\..\libs\gsl\Release;..\..\libs\boost-lib\stage\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/source/input/ini_to_core_reader.cpp b/source/input/ini_to_core_reader.cpp
@@ -126,7 +126,7 @@ int INIToCoreReader::valueHandler( void* user, const char* section, const char*
             if ( csvFilePath.is_relative() ) {
               fs::path iniFilePath( reader->iniFilePath );
               fs::path fullPath( iniFilePath.parent_path() / csvFilePath );
-              csvFileName = fullPath.c_str();
+              csvFileName = fullPath.string();
             }
 
             CSVTableReader tableReader( csvFileName );

diff --git a/source/main.cpp b/source/main.cpp
@@ -103,12 +103,15 @@ int main (int argc, char * const argv[]) {
     catch( h_exception e ) {
         cerr << "* Program exception: " << e.msg << "\n* Function " << e.func << ", file "
         << e.file << ", line " << e.linenum << endl;
+        return 1;
     }
     catch( std::exception &e ) {
         cerr << "Standard exception: " << e.what() << endl;
+        return 2;
     }
     catch( ... ) {
         cerr << "Other exception! " << endl;
+        return 3;
     }
 
     return 0;