Index: trunk/FACT++/src/Configuration.cc
===================================================================
--- trunk/FACT++/src/Configuration.cc	(revision 11478)
+++ trunk/FACT++/src/Configuration.cc	(revision 11479)
@@ -285,5 +285,5 @@
    }
 
-template<class T, class S> // Needed by the lexical_cast to convert the option
+template<class T, class S> // Needed to convert the option
    std::istream &operator>>(std::istream &in,  pair<T,S> &f)
    {
@@ -335,5 +335,4 @@
 #include <boost/regex.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
 
 #define HAS_SQL
@@ -420,5 +419,5 @@
     const string server = what[5];
     const string db     = what[9];
-    const int port      = atoi(string(what[7]).c_str());
+    const int port      = stoi(string(what[7]));
 
     cout << "Connecting to '";
@@ -624,26 +623,26 @@
 
     if (v.value().type()==typeid(int16_t))
-        return boost::lexical_cast<string>(v.as<int16_t>());
+        return to_string((long long int)v.as<int16_t>());
 
     if (v.value().type()==typeid(int32_t))
-        return boost::lexical_cast<string>(v.as<int32_t>());
+        return to_string((long long int)v.as<int32_t>());
 
     if (v.value().type()==typeid(int64_t))
-        return boost::lexical_cast<string>(v.as<int64_t>());
+        return to_string((long long int)v.as<int64_t>());
 
     if (v.value().type()==typeid(uint16_t))
-        return boost::lexical_cast<string>(v.as<uint16_t>());
+        return to_string((long long unsigned int)v.as<uint16_t>());
 
     if (v.value().type()==typeid(uint32_t))
-        return boost::lexical_cast<string>(v.as<uint32_t>());
+        return to_string((long long unsigned int)v.as<uint32_t>());
 
     if (v.value().type()==typeid(uint64_t))
-        return boost::lexical_cast<string>(v.as<uint64_t>());
+        return to_string((long long unsigned int)v.as<uint64_t>());
 
     if (v.value().type()==typeid(float))
-        return boost::lexical_cast<string>(v.as<float>());
+        return to_string((long double)v.as<float>());
 
     if (v.value().type()==typeid(double))
-        return boost::lexical_cast<string>(v.as<double>());
+        return to_string((long double)v.as<double>());
 
     if (v.value().type()==typeid(vector<string>))
Index: trunk/FACT++/src/Connection.cc
===================================================================
--- trunk/FACT++/src/Connection.cc	(revision 11478)
+++ trunk/FACT++/src/Connection.cc	(revision 11479)
@@ -11,6 +11,4 @@
 #include "Connection.h"
 
-#include <boost/lexical_cast.hpp>
-
 using namespace std;
 
@@ -19,5 +17,4 @@
 namespace dummy = ba::placeholders;
 
-using boost::lexical_cast;
 using ba::ip::tcp;
 
@@ -292,5 +289,5 @@
 {
     const string host = endpoint.port()==0 ? "" :
-        endpoint.address().to_string()+":"+lexical_cast<string>(endpoint.port());
+        endpoint.address().to_string()+':'+to_string((long long unsigned int)endpoint.port());
 
     // Connection established
@@ -434,5 +431,5 @@
 
     fAddress = addr;
-    fPort    = lexical_cast<string>(port);
+    fPort    = to_string((long long)port);
 }
 
Index: trunk/FACT++/src/ConnectionUSB.cc
===================================================================
--- trunk/FACT++/src/ConnectionUSB.cc	(revision 11478)
+++ trunk/FACT++/src/ConnectionUSB.cc	(revision 11479)
@@ -9,5 +9,4 @@
 
 #include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
 
 using namespace std;
@@ -17,5 +16,4 @@
 namespace dummy = ba::placeholders;
 
-using boost::lexical_cast;
 using ba::serial_port_base;
 
Index: trunk/FACT++/src/Console.cc
===================================================================
--- trunk/FACT++/src/Console.cc	(revision 11478)
+++ trunk/FACT++/src/Console.cc	(revision 11479)
@@ -94,5 +94,5 @@
         fLogO.SetBacklog(false);
         fLogO.SetNullOutput(false);
-        usleep(atoi(str.c_str()+3)*1000);
+        usleep(stoul(str.substr(3))*1000);
         fLogO.SetNullOutput(true);
         fLogO.SetBacklog(true);
Index: trunk/FACT++/src/Converter.cc
===================================================================
--- trunk/FACT++/src/Converter.cc	(revision 11478)
+++ trunk/FACT++/src/Converter.cc	(revision 11479)
@@ -775,5 +775,5 @@
         const string n = what[3]; // counter
 
-        const int cnt = atoi(n.c_str());
+        const int cnt = stoi(n);
 
         // if the :N part was not given assume 1
Index: trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- trunk/FACT++/src/EventBuilderWrapper.h	(revision 11478)
+++ trunk/FACT++/src/EventBuilderWrapper.h	(revision 11479)
@@ -1679,5 +1679,5 @@
                 ostringstream str;
                 str << (ver[i]>>8) << '.' << (ver[i]&0xff);
-                data[i] = atof(str.str().c_str());
+                data[i] = stof(str.str());
             }
             Update(fDimFwVersion, data);
Index: trunk/FACT++/src/EventImp.cc
===================================================================
--- trunk/FACT++/src/EventImp.cc	(revision 11478)
+++ trunk/FACT++/src/EventImp.cc	(revision 11479)
@@ -158,5 +158,5 @@
     string buffer;
     while (getline(stream, buffer, sep ? ' ' : ','))
-        AddAllowedState(atoi(buffer.c_str()));
+        AddAllowedState(stoi(buffer));
 }
 
Index: trunk/FACT++/src/LocalControl.h
===================================================================
--- trunk/FACT++/src/LocalControl.h	(revision 11478)
+++ trunk/FACT++/src/LocalControl.h	(revision 11479)
@@ -115,5 +115,5 @@
             const Time timeout = ms<=0 ? Time(Time::none) : Time()+boost::posix_time::millisec(ms);
 
-            const int target = atoi(str.c_str()+3);
+            const int target = stoi(str.substr(3));
             while (fStateMachine->GetCurrentState()!=target && timeout>Time())
                 usleep(1);
Index: trunk/FACT++/src/Readline.cc
===================================================================
--- trunk/FACT++/src/Readline.cc	(revision 11478)
+++ trunk/FACT++/src/Readline.cc	(revision 11479)
@@ -993,5 +993,5 @@
     if (str.substr(0, 3)==".w ")
     {
-         usleep(atoi(str.c_str()+3)*1000);
+         usleep(stoi(str.substr(3))*1000);
          return true;
     }
Index: trunk/FACT++/src/StateMachineDim.cc
===================================================================
--- trunk/FACT++/src/StateMachineDim.cc	(revision 11478)
+++ trunk/FACT++/src/StateMachineDim.cc	(revision 11479)
@@ -18,6 +18,4 @@
 #include "StateMachineDim.h"
 
-#include <boost/lexical_cast.hpp>
-
 #include "tools.h"
 
@@ -26,5 +24,4 @@
 
 using namespace std;
-using boost::lexical_cast;
 
 const int StateMachineDim::fVersion = 42;
@@ -110,5 +107,5 @@
 
     const string str0 = reinterpret_cast<char*>(fDescriptionStates.itsData);
-    const string str1 = lexical_cast<string>(state)+':'+name+'=';
+    const string str1 = to_string((long long)state)+':'+name+'=';
 
     if (str0.find(str1)!=string::npos)
Index: trunk/FACT++/src/fscctrl.cc
===================================================================
--- trunk/FACT++/src/fscctrl.cc	(revision 11478)
+++ trunk/FACT++/src/fscctrl.cc	(revision 11479)
@@ -172,5 +172,5 @@
             if (buffer.substr(0, 8)=="status: ")
             {
-                status = atoi(buffer.c_str()+8);
+                status = stoi(buffer.substr(8));
                 continue;
             }
@@ -178,5 +178,5 @@
             if (buffer.substr(0, 8)=="time_s: ")
             {
-                time = atof(buffer.c_str()+8);
+                time = stof(buffer.substr(8));
                 continue;
             }
Index: trunk/FACT++/src/scheduler.cc
===================================================================
--- trunk/FACT++/src/scheduler.cc	(revision 11478)
+++ trunk/FACT++/src/scheduler.cc	(revision 11479)
@@ -193,5 +193,5 @@
         const string server = what[3];
         const string db     = fDBName.empty() ? what[6] : fDBName;
-        const int    port   = atoi(string(what[5]).c_str());
+        const int    port   = stoi(what[5]);
 
         ostringstream dbnamemsg;