From 6264bbf0b4e9250b1deceaec43c34f3b0416b440 Mon Sep 17 00:00:00 2001
From: Valient Gough <vgough@pobox.com>
Date: Sun, 11 May 2008 03:41:24 +0000
Subject: [PATCH] fixes for compile errors reported on mailinglist

git-svn-id: http://encfs.googlecode.com/svn/trunk@23 db9cf616-1c43-0410-9cb8-a902689de0d6
---
 encfs/ConfigVar.cpp | 2 ++
 encfs/FileUtils.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/encfs/ConfigVar.cpp b/encfs/ConfigVar.cpp
index 47aaa4e..12d9075 100644
--- a/encfs/ConfigVar.cpp
+++ b/encfs/ConfigVar.cpp
@@ -18,6 +18,8 @@
 #include "ConfigVar.h"
 #include <rlog/rlog.h>
 
+#include <string.h>
+
 using namespace rlog;
 
 #ifndef MIN
diff --git a/encfs/FileUtils.cpp b/encfs/FileUtils.cpp
index 6aa4e62..46dd5ed 100644
--- a/encfs/FileUtils.cpp
+++ b/encfs/FileUtils.cpp
@@ -67,6 +67,7 @@ using namespace rlog;
 using namespace std;
 using namespace gnu;
 namespace fs = boost::filesystem;
+namespace serial = boost::serialization;
 
 static const int DefaultBlockSize = 1024;
 // The maximum length of text passwords.  If longer are needed,
@@ -137,7 +138,8 @@ namespace boost
             ar << make_nvp("encodedKeySize", keyLen);
             char key[keyLen];
             memcpy(key, cfg.keyData.data(), keyLen);
-            ar << make_nvp("encodedKeyData", make_binary_object(key, keyLen));
+            ar << make_nvp("encodedKeyData", 
+                    serial::make_binary_object(key, keyLen));
         }
 
         template<class Archive>
@@ -161,7 +163,7 @@ namespace boost
             ar >> make_nvp("encodedKeySize", encodedKeySize);
             char key[encodedKeySize];
             ar >> make_nvp("encodedKeyData", 
-                    make_binary_object(key, encodedKeySize));
+                    serial::make_binary_object(key, encodedKeySize));
             cfg.keyData.assign( (char*)key, encodedKeySize );
         }