summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-02-03 15:28:30 (UTC)
committer Michael Krelin <hacker@klever.net>2008-02-03 15:28:30 (UTC)
commitd1c45af16b3bd31f65d03eec0fcd1c61b4d69fb0 (patch) (side-by-side diff)
tree34fc1389a138a2c33ccfceb595379a16a0139768
parent5f742d37f78d626e0140632b28b072f892fd98c3 (diff)
downloadlibopkele-d1c45af16b3bd31f65d03eec0fcd1c61b4d69fb0.zip
libopkele-d1c45af16b3bd31f65d03eec0fcd1c61b4d69fb0.tar.gz
libopkele-d1c45af16b3bd31f65d03eec0fcd1c61b4d69fb0.tar.bz2
moved openid_endpoint_t to types.h
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--include/opkele/basic_rp.h18
-rw-r--r--include/opkele/types.h18
2 files changed, 18 insertions, 18 deletions
diff --git a/include/opkele/basic_rp.h b/include/opkele/basic_rp.h
index 3f17fd9..d5356aa 100644
--- a/include/opkele/basic_rp.h
+++ b/include/opkele/basic_rp.h
@@ -1,36 +1,18 @@
#ifndef __OPKELE_BASIC_RP_H
#define __OPKELE_BASIC_RP_H
-#include <cstring>
#include <string>
#include <opkele/types.h>
#include <opkele/extension.h>
namespace opkele {
using std::string;
- struct openid_endpoint_t {
- string uri;
- string claimed_id;
- string local_id;
-
- openid_endpoint_t() { }
- openid_endpoint_t(const string& u,const string& cid,const string& lid)
- : uri(u), claimed_id(cid), local_id(lid) { }
-
- bool operator==(const openid_endpoint_t& x) const {
- return uri==x.uri && local_id==x.local_id; }
- bool operator<(const openid_endpoint_t& x) const {
- int c;
- return (c=strcmp(uri.c_str(),x.uri.c_str()))
- ? (c<0) : (strcmp(local_id.c_str(),x.local_id.c_str())<0); }
- };
-
class basic_RP {
public:
virtual ~basic_RP() { }
/**
* @name Global persistent store API
* These are functions related to the associations with OP storage
diff --git a/include/opkele/types.h b/include/opkele/types.h
index 5d39a5c..6ab51ef 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -1,16 +1,17 @@
#ifndef __OPKELE_TYPES_H
#define __OPKELE_TYPES_H
/**
* @file
* @brief various types declarations
*/
+#include <cstring>
#include <ostream>
#include <vector>
#include <string>
#include <map>
#include <set>
#include <list>
#include <opkele/iterator.h>
#include <opkele/tr1-mem.h>
@@ -201,11 +202,28 @@ namespace opkele {
*/
void parse_keyvalues(const string& kv) {
from_keyvalues(kv); }
string append_query(const string& url,const char *prefix="openid.") const;
};
+ struct openid_endpoint_t {
+ string uri;
+ string claimed_id;
+ string local_id;
+
+ openid_endpoint_t() { }
+ openid_endpoint_t(const string& u,const string& cid,const string& lid)
+ : uri(u), claimed_id(cid), local_id(lid) { }
+
+ bool operator==(const openid_endpoint_t& x) const {
+ return uri==x.uri && local_id==x.local_id; }
+ bool operator<(const openid_endpoint_t& x) const {
+ int c;
+ return (c=strcmp(uri.c_str(),x.uri.c_str()))
+ ? (c<0) : (strcmp(local_id.c_str(),x.local_id.c_str())<0); }
+ };
+
}
#endif /* __OPKELE_TYPES_H */