From 691950e18cf08a3f9bbc2004501834cd47bea579 Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Mon, 11 Apr 2016 15:50:17 +0200
Subject: Cpp: Remove last usages of boost

* lang/cpp/src/configuration.cpp: Use std::remove_pointer.
  (Configuration::operator<<): std::for_each.
* lang/cpp/src/context.cpp: Delete manually instead of scoped ptr.
* lang/cpp/src/scdgetinfoassuantransaction.cpp: Use static_assert.
  (to_reader_list): Tokenize with getline.
---
 lang/cpp/src/scdgetinfoassuantransaction.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'lang/cpp/src/scdgetinfoassuantransaction.cpp')

diff --git a/lang/cpp/src/scdgetinfoassuantransaction.cpp b/lang/cpp/src/scdgetinfoassuantransaction.cpp
index a07ed96b..073d7724 100644
--- a/lang/cpp/src/scdgetinfoassuantransaction.cpp
+++ b/lang/cpp/src/scdgetinfoassuantransaction.cpp
@@ -25,14 +25,10 @@
 #include "data.h"
 #include "util.h"
 
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/static_assert.hpp>
-
 #include <sstream>
+#include <assert.h>
 
 using namespace GpgME;
-using namespace boost;
 
 ScdGetInfoAssuanTransaction::ScdGetInfoAssuanTransaction(InfoItem item)
     : AssuanTransaction(),
@@ -48,7 +44,12 @@ ScdGetInfoAssuanTransaction::~ScdGetInfoAssuanTransaction() {}
 static std::vector<std::string> to_reader_list(const std::string &s)
 {
     std::vector<std::string> result;
-    return split(result, s, is_any_of("\n"), token_compress_on);
+    std::stringstream ss(s);
+    std::string tok;
+    while (std::getline(ss, tok, '\n')) {
+        result.push_back(tok);
+    }
+    return result;
 }
 
 static std::vector<std::string> to_app_list(const std::string &s)
@@ -119,7 +120,8 @@ static const char *const scd_getinfo_tokens[] = {
     "deny_admin",
     "app_list",
 };
-BOOST_STATIC_ASSERT((sizeof scd_getinfo_tokens / sizeof * scd_getinfo_tokens == ScdGetInfoAssuanTransaction::LastInfoItem));
+static_assert((sizeof scd_getinfo_tokens / sizeof * scd_getinfo_tokens == ScdGetInfoAssuanTransaction::LastInfoItem),
+              "getinfo_tokens size mismatch");
 
 void ScdGetInfoAssuanTransaction::makeCommand() const
 {
-- 
cgit v1.2.3