Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unnecessary lines end space. #3

Merged
merged 1 commit into from
Mar 31, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion riak_client/cxx/basic.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion riak_client/cxx/basic/basic_client.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
10 changes: 5 additions & 5 deletions riak_client/cxx/basic/bucket_properties.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@

#include <riak_client/cxx/riak_client_fwd.hpp>

namespace riak {
namespace riak {

/// Customizable properties of a Riak Bucket.
///
///
/// @see http://wiki.basho.com/Basic-Riak-API-Operations.html
class RIAKC_API bucket_properties
{
public:
bucket_properties()
bucket_properties()
: allow_mult_(false), n_val_(-1) { }

/// Return the value of the <dfn>allow_mult</dfn> bucket property.
Expand All @@ -41,7 +41,7 @@ class RIAKC_API bucket_properties

/// Return the <dfn>n-val</dfn> bucket property.
///
/// The n-value is the replication factor of a bucket.
/// The n-value is the replication factor of a bucket.
int n_val() const
{
return n_val_;
Expand All @@ -53,7 +53,7 @@ class RIAKC_API bucket_properties
allow_mult_ = allow;
}

/// Set the <dfn>n_val</dfn> bucket property.
/// Set the <dfn>n_val</dfn> bucket property.
void n_val(int n)
{
n_val_ = n;
Expand Down
8 changes: 4 additions & 4 deletions riak_client/cxx/basic/quorum.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

#include <riak_client/cxx/riak_client_fwd.hpp>

namespace riak {
namespace riak {

struct quora
struct quora
{
quora() : qval_(-1) {}
quora(int val) : qval_(val) {}
Expand All @@ -33,8 +33,8 @@ namespace riak {
struct ONE : quora {};
struct ALL : quora {};
struct QUORUM : quora {};
struct DEFAULT : quora {};
struct DEFAULT : quora {};

} // :: riak

#endif // include guard
12 changes: 6 additions & 6 deletions riak_client/cxx/basic/response.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -23,8 +23,8 @@
namespace riak {

template <class T>
class RIAKC_API response
{
class RIAKC_API response
{
public: // constructors
response(const riak_error& error)
: error_(error), value_() { }
Expand All @@ -34,11 +34,11 @@ class RIAKC_API response
public: // accessors
riak_error error() const { return error_; }

T value() {
if (error_) {
T value() {
if (error_) {
throw exception(error_);
}
return value_;
return value_;
}
operator T() { return value(); }
operator const T() const { return value(); }
Expand Down
14 changes: 7 additions & 7 deletions riak_client/cxx/basic/riak_result.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -21,7 +21,7 @@
#include <riak_client/cxx/error.hpp>
#include <riak_client/cxx/object.hpp>

namespace riak {
namespace riak {

class RIAKC_API riak_result : public riak_version
{
Expand All @@ -45,17 +45,17 @@ class RIAKC_API riak_result : public riak_version
bool not_found() const { return contents_.empty(); }
std::size_t sibling_count() const { return contents_.size(); }
const content_vector& contents() const { return contents_; }
operator object()
operator object()
{
if (contents_.size() != 1)
if (contents_.size() != 1)
{
throw riak::exception("unresolved conflict");
}
return object(*this, contents_[0]);
}
operator const object() const
{
if (contents_.size() != 1)
operator const object() const
{
if (contents_.size() != 1)
{
throw riak::exception("unresolved conflict");
}
Expand Down
4 changes: 2 additions & 2 deletions riak_client/cxx/basic/server_info.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -19,7 +19,7 @@

#include <riak_client/cxx/riak_client_fwd.hpp>

namespace riak {
namespace riak {

class RIAKC_API server_info
{
Expand Down
12 changes: 6 additions & 6 deletions riak_client/cxx/basic/store_params.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -19,9 +19,9 @@

#include <riak_client/cxx/basic/quorum.hpp>

namespace riak {
namespace riak {

class RIAKC_API store_params
class RIAKC_API store_params
{
public:
store_params()
Expand All @@ -35,9 +35,9 @@ class RIAKC_API store_params
store_params& w(quora w) { w_ = w; return *this;}
store_params& dw(quora dw) { dw_ = dw; return *this;}
store_params& pw(quora pw) { pw_ = pw; return *this; }
store_params& return_body(bool returnbody)
{
return_body_ = returnbody;
store_params& return_body(bool returnbody)
{
return_body_ = returnbody;
return *this;
}
private: // intentionally copyable
Expand Down
2 changes: 1 addition & 1 deletion riak_client/cxx/client.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
8 changes: 4 additions & 4 deletions riak_client/cxx/client/bucket.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,26 @@
namespace riak {

template <class T=std::string>
class RIAKC_API basic_bucket
class RIAKC_API basic_bucket
{
public:
basic_bucket(const std::string& name, client_ptr c)
: name_(name), client_(c) { }
public:
const std::string& name() const { return name_; }
string_vector keys() { return client_->list_keys(name_); }
fetch_object<T> fetch(const std::string& key)
fetch_object<T> fetch(const std::string& key)
{
return fetch_object<T>(client_, name_, key);
}
store_object<T> store(const std::string& key, const std::string& value)
{
return store_object<T>(client_, name_, key).with_value(value);
}
store_object<T> store(const std::string& key, const char* buf,
store_object<T> store(const std::string& key, const char* buf,
std::size_t len);

delete_object del(const std::string& key)
delete_object del(const std::string& key)
{
return delete_object(client_, name_, key);
}
Expand Down
12 changes: 6 additions & 6 deletions riak_client/cxx/client/client.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -22,21 +22,21 @@
#include <riak_client/cxx/client/bucket.hpp>
#include <riak_client/cxx/object.hpp>

namespace riak {
namespace riak {

class RIAKC_API client
{
public:
client(const std::string& host, const std::string& port)
: basic_client_(riak::new_client(host, port)) { }
public:
template <class T>
basic_bucket<T> bucket(const std::string& name)
template <class T>
basic_bucket<T> bucket(const std::string& name)
{
return basic_bucket<T>(name, basic_client_);
}

uint32_t get_client_id()
uint32_t get_client_id()
{
return basic_client_->client_id();
}
Expand All @@ -46,7 +46,7 @@ class RIAKC_API client
basic_client_->client_id(client_id);
}

string_vector list_buckets()
string_vector list_buckets()
{
return basic_client_->list_buckets();
}
Expand Down
10 changes: 5 additions & 5 deletions riak_client/cxx/client/cluster.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -44,19 +44,19 @@ class RIAKC_API cluster
cluster(const node& seed_node)
: seed_node_(seed_node) { }
public:
client make_client()
client make_client()
{
return make_client(seed_node_.host(), seed_node_.port());
}
static client make_client(const std::string& host, const std::string& port)
static client make_client(const std::string& host, const std::string& port)
{
return client(host, port);
}

private:
node seed_node_;
std::vector<node> nodes_;
};
};

} // ::riak

Expand Down
6 changes: 3 additions & 3 deletions riak_client/cxx/client/mutation.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -24,8 +24,8 @@ class clobber_mutator
{
public:
clobber_mutator(const T& new_value)
: new_value_(new_value) { }
T operator()(const T& old_value) {
: new_value_(new_value) { }
T operator()(const T& old_value) {
return new_value_;
}
private:
Expand Down
4 changes: 2 additions & 2 deletions riak_client/cxx/client/resolver.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -21,7 +21,7 @@
#include <riak_client/cxx/basic/riak_result.hpp>
#include <riak_client/cxx/object/riak_object.hpp>

namespace riak {
namespace riak {

struct RIAKC_API default_resolver
{
Expand Down
4 changes: 2 additions & 2 deletions riak_client/cxx/common.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -25,7 +25,7 @@
#include <cstddef>
#include "config.h"

namespace riak {
namespace riak {

typedef std::vector<std::string> string_vector;
typedef std::map<std::string, std::string> string_map;
Expand Down
4 changes: 2 additions & 2 deletions riak_client/cxx/error.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -20,7 +20,7 @@
#include <stdexcept>
#include <string>

namespace riak {
namespace riak {

class RIAKC_API riak_error
{
Expand Down
2 changes: 1 addition & 1 deletion riak_client/cxx/object.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions riak_client/cxx/object/link.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2011 Basho Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -22,14 +22,14 @@
#include <string>
#include <vector>

namespace riak {
namespace riak {

class RIAKC_API link
{
public:
link(const std::string& bucket, const std::string& key)
: bkey_(bucket, key) { }
link(const std::string& bucket, const std::string& key,
link(const std::string& bucket, const std::string& key,
const std::string& tag)
: bkey_(bucket, key), tag_(tag) { }
public:
Expand Down
Loading