Skip to content

Commit 208ecd6

Browse files
CFSworksCFSworks
committed
Merge branch 'master' into cmake
2 parents fa1e1a2 + 5f72e9c commit 208ecd6

File tree

182 files changed

+957
-383
lines changed

Some content is hidden

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

182 files changed

+957
-383
lines changed

‎direct/src/dcparser/dcNumericRange.I‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ operator = (const DCNumericRange<NUM> &copy) {
5252
* otherwise.
5353
*/
5454
template <class NUM>
55-
bool DCNumericRange<NUM>::
55+
INLINE bool DCNumericRange<NUM>::
5656
is_in_range(Number num) const {
5757
if (_ranges.empty()) {
5858
return true;
@@ -106,7 +106,7 @@ get_one_value() const {
106106
*
107107
*/
108108
template <class NUM>
109-
void DCNumericRange<NUM>::
109+
INLINE void DCNumericRange<NUM>::
110110
generate_hash(HashGenerator &hashgen) const {
111111
if (!_ranges.empty()) {
112112
hashgen.add_int(_ranges.size());
@@ -124,7 +124,7 @@ generate_hash(HashGenerator &hashgen) const {
124124
*
125125
*/
126126
template <class NUM>
127-
void DCNumericRange<NUM>::
127+
INLINE void DCNumericRange<NUM>::
128128
output(std::ostream &out, Number divisor) const {
129129
if (!_ranges.empty()) {
130130
typename Ranges::const_iterator ri;
@@ -144,7 +144,7 @@ output(std::ostream &out, Number divisor) const {
144144
* characters.
145145
*/
146146
template <class NUM>
147-
void DCNumericRange<NUM>::
147+
INLINE void DCNumericRange<NUM>::
148148
output_char(std::ostream &out, Number divisor) const {
149149
if (divisor != 1) {
150150
output(out, divisor);
@@ -179,7 +179,7 @@ clear() {
179179
* minmax overlaps an existing minmax.
180180
*/
181181
template <class NUM>
182-
bool DCNumericRange<NUM>::
182+
INLINE bool DCNumericRange<NUM>::
183183
add_range(Number min, Number max) {
184184
// Check for an overlap. This is probably indicative of a typo and should
185185
// be reported.

‎direct/src/dcparser/dcNumericRange.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ class EXPCL_DIRECT_DCPARSER DCNumericRange {
3232
INLINE DCNumericRange(const DCNumericRange &copy);
3333
INLINE void operator = (const DCNumericRange &copy);
3434

35-
bool is_in_range(Number num) const;
35+
INLINE bool is_in_range(Number num) const;
3636
INLINE void validate(Number num, bool &range_error) const;
3737

3838
INLINE bool has_one_value() const;
3939
INLINE Number get_one_value() const;
4040

41-
void generate_hash(HashGenerator &hashgen) const;
41+
INLINE void generate_hash(HashGenerator &hashgen) const;
4242

43-
void output(std::ostream &out, Number divisor = 1) const;
44-
void output_char(std::ostream &out, Number divisor = 1) const;
43+
INLINE void output(std::ostream &out, Number divisor = 1) const;
44+
INLINE void output_char(std::ostream &out, Number divisor = 1) const;
4545

4646
public:
4747
INLINE void clear();
48-
bool add_range(Number min, Number max);
48+
INLINE bool add_range(Number min, Number max);
4949

5050
INLINE bool is_empty() const;
5151
INLINE int get_num_ranges() const;

‎direct/src/deadrec/config_deadrec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "dconfig.h"
1717

18-
#if !defined(CPPPARSER) && !defined(BUILDING_DIRECT_DEADREC)
18+
#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) && !defined(BUILDING_DIRECT_DEADREC)
1919
#error Buildsystem error: BUILDING_DIRECT_DEADREC not defined
2020
#endif
2121

‎direct/src/directd/directd.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "pset.h"
3232

33-
#if !defined(CPPPARSER) && !defined(BUILDING_DIRECT_DIRECTD)
33+
#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) && !defined(BUILDING_DIRECT_DIRECTD)
3434
#error Buildsystem error: BUILDING_DIRECT_DIRECTD not defined
3535
#endif
3636

‎direct/src/distributed/PyDatagram.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class PyDatagram(Datagram):
2525
STUint64: (Datagram.addUint64, int),
2626
STFloat64: (Datagram.addFloat64, None),
2727
STString: (Datagram.addString, None),
28-
STBlob: (Datagram.addString, None),
29-
STBlob32: (Datagram.addString32, None),
28+
STBlob: (Datagram.addBlob, None),
29+
STBlob32: (Datagram.addBlob32, None),
3030
}
3131

3232
#def addChannel(self, channelId):

‎direct/src/distributed/PyDatagramIterator.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class PyDatagramIterator(DatagramIterator):
2323
STUint64: DatagramIterator.getUint64,
2424
STFloat64: DatagramIterator.getFloat64,
2525
STString: DatagramIterator.getString,
26-
STBlob: DatagramIterator.getString,
27-
STBlob32: DatagramIterator.getString32,
26+
STBlob: DatagramIterator.getBlob,
27+
STBlob32: DatagramIterator.getBlob32,
2828
}
2929

3030
getChannel = DatagramIterator.getUint64

‎direct/src/distributed/config_distributed.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "config_distributed.h"
1515
#include "dconfig.h"
1616

17-
#if !defined(CPPPARSER) && !defined(BUILDING_DIRECT_DISTRIBUTED)
17+
#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) && !defined(BUILDING_DIRECT_DISTRIBUTED)
1818
#error Buildsystem error: BUILDING_DIRECT_DISTRIBUTED not defined
1919
#endif
2020

‎direct/src/interval/config_interval.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "dconfig.h"
3131

32-
#if !defined(CPPPARSER) && !defined(BUILDING_DIRECT_INTERVAL)
32+
#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) && !defined(BUILDING_DIRECT_INTERVAL)
3333
#error Buildsystem error: BUILDING_DIRECT_INTERVAL not defined
3434
#endif
3535

‎direct/src/leveleditor/ProtoPalette.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"""
44

55
from .ProtoPaletteBase import *
6+
import os
67

78
class ProtoPalette(ProtoPaletteBase):
89
def __init__(self):

‎direct/src/motiontrail/config_motiontrail.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "config_motiontrail.h"
1515
#include "dconfig.h"
1616

17-
#if !defined(CPPPARSER) && !defined(BUILDING_DIRECT_MOTIONTRAIL)
17+
#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) && !defined(BUILDING_DIRECT_MOTIONTRAIL)
1818
#error Buildsystem error: BUILDING_DIRECT_MOTIONTRAIL not defined
1919
#endif
2020

0 commit comments

Comments
 (0)