Skip to content

Commit 8e583b8

Browse files
author
Huang-Ming Huang
committed
Fix include paths so that the working version won’t be mixed with the system install version.
1 parent db9b7b1 commit 8e583b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+135
-135
lines changed

‎.dropbox

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"tag": "shared", "ns": 314976597}

‎src/mfast.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
// This file is part of mFAST.
55
// See the file license.txt for licensing information.
66
#pragma once
7-
#include <mfast/field_instructions.h>
8-
#include <mfast/decimal_ref.h>
9-
#include <mfast/int_ref.h>
10-
#include <mfast/string_ref.h>
11-
#include <mfast/sequence_ref.h>
12-
#include <mfast/message_ref.h>
13-
#include <mfast/nested_message_ref.h>
14-
#include <mfast/malloc_allocator.h>
15-
#include <mfast/field_visitor.h>
16-
#include <mfast/arena_allocator.h>
17-
#include <mfast/field_comparator.h>
18-
#include <mfast/composite_type.h>
19-
#include <mfast/sequence_type.h>
20-
#include <mfast/enum_ref.h>
21-
#include <mfast/boolean_ref.h>
22-
#include <mfast/view_iterator.h>
23-
#include <mfast/ext_ref.h>
7+
#include "mfast/field_instructions.h"
8+
#include "mfast/decimal_ref.h"
9+
#include "mfast/int_ref.h"
10+
#include "mfast/string_ref.h"
11+
#include "mfast/sequence_ref.h"
12+
#include "mfast/message_ref.h"
13+
#include "mfast/nested_message_ref.h"
14+
#include "mfast/malloc_allocator.h"
15+
#include "mfast/field_visitor.h"
16+
#include "mfast/arena_allocator.h"
17+
#include "mfast/field_comparator.h"
18+
#include "mfast/composite_type.h"
19+
#include "mfast/sequence_type.h"
20+
#include "mfast/enum_ref.h"
21+
#include "mfast/boolean_ref.h"
22+
#include "mfast/view_iterator.h"
23+
#include "mfast/ext_ref.h"

‎src/mfast/aggregate_ref.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// See the file license.txt for licensing information.
66
#pragma once
77

8-
#include "mfast/field_instructions.h"
9-
#include "mfast/field_mref.h"
10-
#include "mfast/type_category.h"
8+
#include "field_instructions.h"
9+
#include "field_mref.h"
10+
#include "type_category.h"
1111

1212
#include <boost/iterator/iterator_facade.hpp>
1313
#include <boost/range.hpp>

‎src/mfast/allocator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// This file is part of mFAST.
55
// See the file license.txt for licensing information.
6-
#include "mfast/allocator.h"
6+
#include "allocator.h"
77
#include <new>
88
#include <cstring>
99

‎src/mfast/coder/common/codec_helper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// See the file license.txt for licensing information.
66
#pragma once
77

8-
#include "mfast/string_ref.h"
9-
#include "mfast/exceptions.h"
8+
#include "../../string_ref.h"
9+
#include "../../exceptions.h"
1010
#include <stdexcept>
1111

1212
namespace mfast {

‎src/mfast/coder/common/debug_stream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#pragma once
77

88
#include <iostream>
9-
#include <mfast/output.h>
9+
#include "../../output.h"
1010
#ifdef NDEBUG
1111

1212
struct debug_stream {

‎src/mfast/coder/common/dictionary_builder.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77

88
#include <tuple>
99
#include "../mfast_coder_export.h"
10-
#include "mfast/field_instructions.h"
11-
#include "mfast/arena_allocator.h"
12-
#include "mfast/coder/mfast_coder_export.h"
10+
#include "../../field_instructions.h"
11+
#include "../../arena_allocator.h"
1312
#include <vector>
1413
#include <map>
1514
#include <string>

‎src/mfast/coder/decoder/fast_decoder.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#include <boost/container/map.hpp>
77
#include "../mfast_coder_export.h"
88
#include "../fast_decoder.h"
9-
#include "mfast/field_visitor.h"
10-
#include "mfast/sequence_ref.h"
11-
#include "mfast/malloc_allocator.h"
12-
#include "mfast/output.h"
13-
#include "mfast/composite_type.h"
9+
#include "../../field_visitor.h"
10+
#include "../../sequence_ref.h"
11+
#include "../../malloc_allocator.h"
12+
#include "../../output.h"
13+
#include "../../composite_type.h"
1414
#include "../common/exceptions.h"
1515
#include "../common/debug_stream.h"
1616
#include "../common/template_repo.h"

‎src/mfast/coder/decoder/fast_istream.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
#include <limits>
99

10-
#include "mfast/instructions/string_instructions.h"
11-
#include "mfast/instructions/byte_vector_instruction.h"
10+
#include "../../instructions/string_instructions.h"
11+
#include "../../instructions/byte_vector_instruction.h"
1212
#include "fast_istreambuf.h"
1313
#include "decoder_presence_map.h"
1414

‎src/mfast/coder/decoder/fast_istream_extractor.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// See the file license.txt for licensing information.
66
#pragma once
77

8-
#include "mfast/int_ref.h"
9-
#include "mfast/string_ref.h"
10-
#include "mfast/decimal_ref.h"
8+
#include "../../int_ref.h"
9+
#include "../../string_ref.h"
10+
#include "../../decimal_ref.h"
1111
#include "fast_istream.h"
1212

1313
namespace mfast {

0 commit comments

Comments
 (0)