From 4c84eb388e2d1fac8f360fa8c7a93647a16ca343 Mon Sep 17 00:00:00 2001
From: Juan Hernando Vieites <juan.hernando@epfl.ch>
Date: Tue, 8 Mar 2016 17:06:35 +0100
Subject: [PATCH] Fixed incorrect enum to string conversions in MorphologyHDF5.

The template specialization for boost::lexical_cast was not called in
some configurations.
This fixes morphologyConverter not working for v2 to v1 conversions.
---
 brion/plugin/morphologyHDF5.cpp | 32 ++++++++++----------------------
 doc/Changelog.md                |  2 ++
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/brion/plugin/morphologyHDF5.cpp b/brion/plugin/morphologyHDF5.cpp
index 354e8c7..094f709 100644
--- a/brion/plugin/morphologyHDF5.cpp
+++ b/brion/plugin/morphologyHDF5.cpp
@@ -31,25 +31,6 @@
 
 #include <H5Cpp.h>
 
-#include <boost/lexical_cast.hpp>
-
-namespace boost
-{
-template<>
-inline std::string lexical_cast( const brion::MorphologyRepairStage& s )
-{
-    switch( s )
-    {
-    case brion::MORPHOLOGY_RAW: return "raw";
-    case brion::MORPHOLOGY_UNRAVELED: return "unraveled";
-    case brion::MORPHOLOGY_REPAIRED: return "repaired";
-    case brion::MORPHOLOGY_UNDEFINED:
-    default:
-        throw boost::bad_lexical_cast();
-    }
-}
-}
-
 namespace brion
 {
 namespace plugin
@@ -75,12 +56,19 @@ const std::string _a_apical( "apical" );
 const std::string _a_creator( "creator" );
 const std::string _a_version( "version" );
 
-template< typename T > inline std::string toString( const T& t )
+std::string toString( const brion::enums::MorphologyRepairStage& s )
 {
-    return boost::lexical_cast< std::string >( t );
+    switch( s )
+    {
+    case brion::MORPHOLOGY_RAW: return "raw";
+    case brion::MORPHOLOGY_UNRAVELED: return "unraveled";
+    case brion::MORPHOLOGY_REPAIRED: return "repaired";
+    case brion::MORPHOLOGY_UNDEFINED:
+    default:
+        throw boost::bad_lexical_cast();
+    }
 }
 
-
 lunchbox::PluginRegisterer< MorphologyHDF5 > registerer;
 
 }
diff --git a/doc/Changelog.md b/doc/Changelog.md
index 920a292..254fbdb 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -3,6 +3,8 @@ Changelog {#Changelog}
 
 # git master
 
+* [46](https://github.com/BlueBrain/Brion/pull/46):
+  Fixed a bug in enum to string conversions affecting morphologyConverter.
 * [39](https://github.com/BlueBrain/Brion/pull/39):
   Add compartment report converter tool
 * [30](https://github.com/BlueBrain/Brion/pull/30),