Skip to content

Commit 9c8eea3

Browse files
Pchelolowebmakersteve
authored andcommitted
Don't point to the headers in the submodule explicitly (#54)
Don't point to the headers in the submodule explicitly. Allow to directly pull in the rdkafkacpp.h header file
1 parent c27ae2f commit 9c8eea3

10 files changed

+12
-10
lines changed

cpplint.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,10 @@
399399
# - Anything not following google file name conventions (containing an
400400
# uppercase character, such as Python.h or nsStringAPI.h, for example).
401401
# - Lua headers.
402+
# - rdkafka.cpp header, because it would be located in different directories depending
403+
# on whether it's pulled from librdkafka sources or librdkafka-dev package.
402404
_THIRD_PARTY_HEADERS_PATTERN = re.compile(
403-
r'^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$')
405+
r'^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h|rdkafkacpp\.h)$')
404406

405407

406408
# Assertion macros. These are defined in base/logging.h and

src/binding.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include <nan.h>
1414
#include <string>
15-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
15+
#include "rdkafkacpp.h"
1616
#include "src/common.h"
1717
#include "src/errors.h"
1818
#include "src/config.h"

src/callbacks.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <vector>
1616

17-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
17+
#include "rdkafkacpp.h"
1818
#include "src/common.h"
1919

2020
typedef Nan::Persistent<v8::Function,

src/common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <string>
1717
#include <vector>
1818

19-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
19+
#include "rdkafkacpp.h"
2020

2121
#include "src/errors.h"
2222

src/config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <list>
1717
#include <string>
1818

19-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
19+
#include "rdkafkacpp.h"
2020
#include "src/common.h"
2121
#include "src/callbacks.h"
2222

src/connection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <iostream>
1515
#include <string>
1616

17-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
17+
#include "rdkafkacpp.h"
1818

1919
#include "src/common.h"
2020
#include "src/errors.h"

src/consumer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <string>
1717
#include <vector>
1818

19-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
19+
#include "rdkafkacpp.h"
2020

2121
#include "src/common.h"
2222
#include "src/connection.h"

src/errors.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <iostream>
1515
#include <string>
1616

17-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
17+
#include "rdkafkacpp.h"
1818

1919
#include "src/common.h"
2020

src/producer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <node_buffer.h>
1616
#include <string>
1717

18-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
18+
#include "rdkafkacpp.h"
1919

2020
#include "src/common.h"
2121
#include "src/connection.h"

src/topic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <nan.h>
1414
#include <string>
1515

16-
#include "deps/librdkafka/src-cpp/rdkafkacpp.h"
16+
#include "rdkafkacpp.h"
1717

1818
#include "src/config.h"
1919

0 commit comments

Comments
 (0)