projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Hrm. Turns out we _can_ turn on strict-aliasing.
[awesomized/libmemcached]
/
tests
/
plus.cpp
diff --git
a/tests/plus.cpp
b/tests/plus.cpp
index ab9cdbe6e7d466be903917d7defdcb3e7eb57d22..4a3789b93a741c427b4b541f79c1f1314b3fb197 100644
(file)
--- a/
tests/plus.cpp
+++ b/
tests/plus.cpp
@@
-1,8
+1,9
@@
/*
C++ interface test
*/
/*
C++ interface test
*/
+#include "libmemcached/memcached.hh"
+
#include <assert.h>
#include <assert.h>
-#include <memcached.hh>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-15,10
+16,18
@@
#include "test.h"
#include "test.h"
+extern "C" {
+ test_return basic_test(memcached_st *memc);
+ uint8_t increment_test(memcached_st *memc);
+ test_return basic_master_key_test(memcached_st *memc);
+ void *world_create(void);
+ void world_destroy(void *p);
+}
+
test_return basic_test(memcached_st *memc)
{
test_return basic_test(memcached_st *memc)
{
- Memcached foo;
- char *value_set= "This is some data";
+ Memcached foo
(memc)
;
+ c
onst c
har *value_set= "This is some data";
char *value;
size_t value_length;
char *value;
size_t value_length;
@@
-32,10
+41,10
@@
test_return basic_test(memcached_st *memc)
uint8_t increment_test(memcached_st *memc)
{
uint8_t increment_test(memcached_st *memc)
{
- Memcached mcach;
+ Memcached mcach
(memc)
;
memcached_return rc;
memcached_return rc;
- char *key= "inctest";
- char *inc_value= "1";
+ c
onst c
har *key= "inctest";
+ c
onst c
har *inc_value= "1";
char *ret_value;
uint64_t int_inc_value;
uint64_t int_ret_value;
char *ret_value;
uint64_t int_inc_value;
uint64_t int_ret_value;
@@
-65,11
+74,11
@@
uint8_t increment_test(memcached_st *memc)
test_return basic_master_key_test(memcached_st *memc)
{
test_return basic_master_key_test(memcached_st *memc)
{
-
Memcached foo
;
- char *value_set= "Data for server A";
- char *master_key_a= "server-a";
- char *master_key_b= "server-b";
- char *key= "xyz";
+
Memcached foo(memc)
;
+ c
onst c
har *value_set= "Data for server A";
+ c
onst c
har *master_key_a= "server-a";
+ c
onst c
har *master_key_b= "server-b";
+ c
onst c
har *key= "xyz";
char *value;
size_t value_length;
char *value;
size_t value_length;
@@
-98,10
+107,8
@@
collection_st collection[] ={
#define SERVERS_TO_CREATE 1
#define SERVERS_TO_CREATE 1
-void *world_create(void)
+
extern "C"
void *world_create(void)
{
{
- unsigned int x;
- memcached_server_st *servers;
server_startup_st *construct;
construct= (server_startup_st *)malloc(sizeof(server_startup_st));
server_startup_st *construct;
construct= (server_startup_st *)malloc(sizeof(server_startup_st));
@@
-115,8
+122,9
@@
void *world_create(void)
void world_destroy(void *p)
{
void world_destroy(void *p)
{
- server_startup_st *construct= (server_startup_st *)p;
- memcached_server_st *servers= (memcached_server_st *)construct->servers;
+ server_startup_st *construct= static_cast<server_startup_st *>(p);
+ memcached_server_st *servers=
+ static_cast<memcached_server_st *>(construct->servers);
memcached_server_list_free(servers);
server_shutdown(construct);
memcached_server_list_free(servers);
server_shutdown(construct);