Update util (fix dist issues)

diff --git a/util/instance.cc b/util/instance.cc
index a5c289efaae27db17d8e6d341625ce36a2e9f4b3..23c8aec4f5947997d871bf766f70636c00851dca 100644 (file)
--- a/util/instance.cc
+++ b/util/instance.cc
@@ -42,6 +42,7 @@
 
 #include <cstdio>
 #include <sstream>
+#include <iostream>
 #include <netdb.h>
 #include <poll.h>
 #include <sys/socket.h>

diff --git a/util/instance.hpp b/util/instance.hpp
index ff750f4fc293f38d8c62b62c173b0dc4fb49d330..bd9aeaa4a90507b3105df56e241f039e59654d56 100644 (file)
--- a/util/instance.hpp
+++ b/util/instance.hpp
@@ -43,6 +43,7 @@
 #include <cassert>
 #include <cstddef>
 #include <sys/socket.h>
+#include <string>
 
 #include "util/operation.hpp"
 

diff --git a/util/operation.cc b/util/operation.cc
new file mode 100644 (file)
index 0000000..ad19e2b
--- /dev/null
+++ b/util/operation.cc
@@ -0,0 +1,72 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  DataDifferential Utility Library
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#include <config.h>
+
+#include "util/operation.hpp"
+#include <string>
+
+namespace datadifferential {
+namespace util {
+
+bool Operation::response(std::string &arg)
+{
+  if (_response.empty())
+    return false;
+
+  if (not memcmp("OK\r\n", &_response[0], 3))
+  { }
+  else if (not memcmp("OK ", &_response[0], 3))
+  {
+    arg.append(&_response[3], _response.size() -3);
+  }
+  else if (not memcmp("ERR ", &_response[0], 4))
+  {
+    arg.append(&_response[4], _response.size() -4);
+    return false;
+  }
+  else 
+  {
+    arg.append(&_response[0], _response.size());
+  }
+
+  return true;
+}
+
+} /* namespace util */
+} /* namespace datadifferential */

diff --git a/util/operation.hpp b/util/operation.hpp
index 5c8c26edee39f7bc2049bdd8422c0c429749ec8a..13aeeb15f2761717a7b4d89f88a6653cc6db0a70 100644 (file)
--- a/util/operation.hpp
+++ b/util/operation.hpp
@@ -39,7 +39,7 @@
 
 
 #include <cstring>
-#include <iostream>
+#include <iosfwd>
 #include <vector>
 
 namespace datadifferential {
@@ -86,29 +86,7 @@ public:
   }
 
   // Return false on error
-  bool response(std::string &arg)
-  {
-    if (_response.empty())
-      return false;
-
-    if (not memcmp("OK\r\n", &_response[0], 3))
-    { }
-    else if (not memcmp("OK ", &_response[0], 3))
-    {
-      arg.append(&_response[3], _response.size() -3);
-    }
-    else if (not memcmp("ERR ", &_response[0], 4))
-    {
-      arg.append(&_response[4], _response.size() -4);
-      return false;
-    }
-    else 
-    {
-      arg.append(&_response[0], _response.size());
-    }
-
-    return true;
-  }
+  bool response(std::string &);
 
   bool reconnect() const
   {