aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-06-17 21:51:31 +0000
committerlloyd <[email protected]>2010-06-17 21:51:31 +0000
commit991f744c5a3e9610a2e4af70ae5daeb7a943a38e (patch)
tree859f362d098dae683089f91fa905b498284883df
parentc06b260b3328c5ce4be44c4f1a88feb55ee3dbc4 (diff)
Post merge fixups
-rw-r--r--src/cert/x509/x509stor.h2
-rw-r--r--src/filters/filter.h3
2 files changed, 0 insertions, 5 deletions
diff --git a/src/cert/x509/x509stor.h b/src/cert/x509/x509stor.h
index c375c19cb..8f2d5b405 100644
--- a/src/cert/x509/x509stor.h
+++ b/src/cert/x509/x509stor.h
@@ -92,8 +92,6 @@ class BOTAN_DLL X509_Store
X509_Store(const X509_Store&);
~X509_Store();
private:
- X509_Store& operator=(const X509_Store&) { return (*this); }
-
class BOTAN_DLL CRL_Data
{
public:
diff --git a/src/filters/filter.h b/src/filters/filter.h
index 55274beae..467c4dc58 100644
--- a/src/filters/filter.h
+++ b/src/filters/filter.h
@@ -66,9 +66,6 @@ class BOTAN_DLL Filter
void send(const MemoryRegion<byte>& in) { send(in.begin(), in.size()); }
Filter();
private:
- Filter(const Filter&) {}
- Filter& operator=(const Filter&) { return (*this); }
-
/**
* Start a new message in *this and all following filters. Only for
* internal use, not intended for use in client applications.