Permalink
Browse files

Move Client.h so clients have a better include path

Close #64: move Client.h
  • Loading branch information...
ongardie committed Dec 3, 2014
1 parent 83733fe commit f8f3b7ec08586e308e5635104b2d657ac8053591
@@ -15,7 +15,7 @@

#include <string.h>

#include "Client/Client.h"
#include "include/LogCabin/Client.h"
#include "Client/ClientImplBase.h"
#include "Client/ClientImpl.h"
#include "Client/MockClientImpl.h"
@@ -16,7 +16,7 @@
#include <mutex>
#include <set>

#include "Client/Client.h"
#include "include/LogCabin/Client.h"
#include "Client/ClientImplBase.h"
#include "Client/LeaderRPC.h"
#include "Core/ConditionVariable.h"
@@ -15,7 +15,7 @@

#include <memory>
#include <string>
#include "Client/Client.h"
#include "include/LogCabin/Client.h"

#ifndef LOGCABIN_CLIENT_CLIENTIMPLBASE_H
#define LOGCABIN_CLIENT_CLIENTIMPLBASE_H
@@ -17,13 +17,13 @@
#include <deque>
#include <queue>

#include "Core/Debug.h"
#include "Core/StringUtil.h"
#include "Client/Client.h"
#include "Client/ClientImpl.h"
#include "Client/LeaderRPCMock.h"
#include "Core/Debug.h"
#include "Core/ProtoBuf.h"
#include "Core/StringUtil.h"
#include "build/Protocol/Client.pb.h"
#include "include/LogCabin/Client.h"

namespace LogCabin {
namespace {
@@ -17,7 +17,7 @@
#include <map>
#include <unordered_map>
#include <vector>
#include "Client/Client.h"
#include "include/LogCabin/Client.h"
#include "Client/ClientImpl.h"

#ifndef LOGCABIN_CLIENT_MOCKCLIENTIMPL_H
@@ -17,13 +17,13 @@
#include <deque>
#include <queue>

#include "Core/Debug.h"
#include "Core/StringUtil.h"
#include "Client/Client.h"
#include "Client/ClientImpl.h"
#include "Client/LeaderRPCMock.h"
#include "Core/Debug.h"
#include "Core/ProtoBuf.h"
#include "Core/StringUtil.h"
#include "build/Protocol/Client.pb.h"
#include "include/LogCabin/Client.h"

namespace LogCabin {
namespace {
@@ -30,7 +30,7 @@
#include <thread>
#include <unistd.h>

#include "Client/Client.h"
#include <LogCabin/Client.h>

namespace {

@@ -17,7 +17,7 @@
#include <getopt.h>
#include <iostream>

#include "Client/Client.h"
#include <LogCabin/Client.h>

namespace {

@@ -22,7 +22,7 @@
#include <iostream>
#include <string>

#include "Client/Client.h"
#include <LogCabin/Client.h>

namespace {

@@ -22,7 +22,7 @@
#include <getopt.h>
#include <iostream>

#include "Client/Client.h"
#include <LogCabin/Client.h>

namespace {

@@ -58,6 +58,7 @@ if env["VERBOSE"] == "0":
env["LINKCOMSTR"] = "Linking $TARGET"

env.Append(CPPPATH = '#')
env.Append(CPPPATH = '#/include')

# Define protocol buffers builder to simplify SConstruct files
def Protobuf(env, source):
@@ -25,8 +25,8 @@
#include <string>
#include <vector>

#ifndef LOGCABIN_CLIENT_CLIENT_H
#define LOGCABIN_CLIENT_CLIENT_H
#ifndef LOGCABIN_INCLUDE_LOGCABIN_CLIENT_H
#define LOGCABIN_INCLUDE_LOGCABIN_CLIENT_H

namespace LogCabin {
namespace Client {
@@ -489,4 +489,4 @@ class Cluster {
} // namespace LogCabin::Client
} // namespace LogCabin

#endif /* LOGCABIN_CLIENT_CLIENT_H */
#endif /* LOGCABIN_INCLUDE_LOGCABIN_CLIENT_H */

0 comments on commit f8f3b7e

Please sign in to comment.