Skip to content

P
proview
Commit 9c1780a8 authored by Christoffer Ackelman's avatar Christoffer Ackelman
Browse files
Options

Fixed compile warning about dynamic throw specification.

parent b23e49bb
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 79 deletions
src/tools/bld/src/os_linux/hw_x86/variables.mk
View file @ 9c1780a8
...@@ -200,7 +200,7 @@ mkdir := mkdir ...@@ -200,7 +200,7 @@ mkdir := mkdir
# Set to /buildversion for frozen dbs versions # Set to /buildversion for frozen dbs versions
wblflags := wblflags :=
warnings := -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-sign-compare -Wno-missing-field-initializers warnings := -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-sign-compare -Wno-missing-field-initializers -Wno-cast-function-type -Wno-implicit-fallthrough
ifeq ($(pwre_btype),rls) ifeq ($(pwre_btype),rls)
cflags := $(cross_compile) -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC $(warnings) cflags := $(cross_compile) -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC $(warnings)
......
src/tools/bld/src/os_linux/hw_x86_64/variables.mk
View file @ 9c1780a8
...@@ -200,7 +200,7 @@ mkdir := mkdir ...@@ -200,7 +200,7 @@ mkdir := mkdir
# Set to /buildversion for frozen dbs versions # Set to /buildversion for frozen dbs versions
wblflags := wblflags :=
warnings := -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-sign-compare -Wno-missing-field-initializers -Wno-deprecated -Wno-cast-function-type -Wno-deprecated warnings := -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-sign-compare -Wno-missing-field-initializers -Wno-cast-function-type -Wno-implicit-fallthrough
ifeq ($(pwre_btype),rls) ifeq ($(pwre_btype),rls)
cflags := $(cross_compile) -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC $(warnings) cflags := $(cross_compile) -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC $(warnings)
......
wb/lib/wb/src/wb_name.cpp
View file @ 9c1780a8
...@@ -106,37 +106,37 @@ std::ostream& operator<<(std::ostream& os, const wb_name& name) ...@@ -106,37 +106,37 @@ std::ostream& operator<<(std::ostream& os, const wb_name& name)
return os; return os;
} }
bool wb_name::hasVolume() const throw(wb_error) bool wb_name::hasVolume() const
{ {
check(); check();
return m_nrep->hasVolume(); return m_nrep->hasVolume();
} }
bool wb_name::hasPath() const throw(wb_error) bool wb_name::hasPath() const
{ {
check(); check();
return m_nrep->hasPath(); return m_nrep->hasPath();
} }
bool wb_name::hasObject() const throw(wb_error) bool wb_name::hasObject() const
{ {
check(); check();
return m_nrep->hasObject(); return m_nrep->hasObject();
} }
bool wb_name::hasSegment(int idx) const throw(wb_error) bool wb_name::hasSegment(int idx) const
{ {
check(); check();
return m_nrep->hasSegment(idx); return m_nrep->hasSegment(idx);
} }
bool wb_name::hasAttribute(int idx) const throw(wb_error) bool wb_name::hasAttribute(int idx) const
{ {
check(); check();
return m_nrep->hasAttribute(idx); return m_nrep->hasAttribute(idx);
} }
bool wb_name::hasAttrIndex(int idx) const throw(wb_error) bool wb_name::hasAttrIndex(int idx) const
{ {
check(); check();
return m_nrep->hasAttrIndex(idx); return m_nrep->hasAttrIndex(idx);
...@@ -154,176 +154,176 @@ int wb_name::segments() ...@@ -154,176 +154,176 @@ int wb_name::segments()
return m_nrep->segments(); return m_nrep->segments();
} }
int wb_name::attrIndex(int idx) const throw(wb_error) int wb_name::attrIndex(int idx) const
{ {
check(); check();
return m_nrep->attrIndex(idx); return m_nrep->attrIndex(idx);
} }
char* wb_name::segment(int idx, char* res) const throw(wb_error) char* wb_name::segment(int idx, char* res) const
{ {
check(); check();
return m_nrep->segment(idx, res); return m_nrep->segment(idx, res);
} }
char* wb_name::path(char* res) const throw(wb_error) char* wb_name::path(char* res) const
{ {
check(); check();
return m_nrep->path(res); return m_nrep->path(res);
} }
char* wb_name::volume(char* res) const throw(wb_error) char* wb_name::volume(char* res) const
{ {
check(); check();
return m_nrep->volume(res); return m_nrep->volume(res);
} }
char* wb_name::object(char* res) const throw(wb_error) char* wb_name::object(char* res) const
{ {
check(); check();
return m_nrep->object(res); return m_nrep->object(res);
} }
char* wb_name::attribute(int idx, char* res) const throw(wb_error) char* wb_name::attribute(int idx, char* res) const
{ {
check(); check();
return m_nrep->attribute(idx, res); return m_nrep->attribute(idx, res);
} }
char* wb_name::normSegment(int idx, char* res) const throw(wb_error) char* wb_name::normSegment(int idx, char* res) const
{ {
check(); check();
return m_nrep->normSegment(idx, res); return m_nrep->normSegment(idx, res);
} }
char* wb_name::normPath(char* res) const throw(wb_error) char* wb_name::normPath(char* res) const
{ {
check(); check();
return m_nrep->normPath(res); return m_nrep->normPath(res);
} }
char* wb_name::normVolume(char* res) const throw(wb_error) char* wb_name::normVolume(char* res) const
{ {
check(); check();
return m_nrep->normVolume(res); return m_nrep->normVolume(res);
} }
char* wb_name::normObject(char* res) const throw(wb_error) char* wb_name::normObject(char* res) const
{ {
check(); check();
return m_nrep->normObject(res); return m_nrep->normObject(res);
} }
char* wb_name::normAttribute(int idx, char* res) const throw(wb_error) char* wb_name::normAttribute(int idx, char* res) const
{ {
check(); check();
return m_nrep->normAttribute(idx, res); return m_nrep->normAttribute(idx, res);
} }
char* wb_name::name() const throw(wb_error) char* wb_name::name() const
{ {
check(); check();
return m_nrep->name(); return m_nrep->name();
} }
char* wb_name::normName() const throw(wb_error) char* wb_name::normName() const
{ {
check(); check();
return m_nrep->normName(); return m_nrep->normName();
} }
char* wb_name::name(int ntype) const throw(wb_error) char* wb_name::name(int ntype) const
{ {
check(); check();
return m_nrep->name(ntype); return m_nrep->name(ntype);
} }
char* wb_name::normName(int ntype) const throw(wb_error) char* wb_name::normName(int ntype) const
{ {
check(); check();
return m_nrep->normName(ntype); return m_nrep->normName(ntype);
} }
bool wb_name::volumeIsEqual(const char* n) const throw(wb_error) bool wb_name::volumeIsEqual(const char* n) const
{ {
check(); check();
return m_nrep->volumeIsEqual(n); return m_nrep->volumeIsEqual(n);
} }
bool wb_name::objectIsEqual(const char* n) const throw(wb_error) bool wb_name::objectIsEqual(const char* n) const
{ {
check(); check();
return m_nrep->objectIsEqual(n); return m_nrep->objectIsEqual(n);
} }
bool wb_name::segmentIsEqual(const char* n, int idx) const throw(wb_error) bool wb_name::segmentIsEqual(const char* n, int idx) const
{ {
check(); check();
return m_nrep->segmentIsEqual(n, idx); return m_nrep->segmentIsEqual(n, idx);
} }
bool wb_name::attributeIsEqual(const char* n, int idx) const throw(wb_error) bool wb_name::attributeIsEqual(const char* n, int idx) const
{ {
check(); check();
return m_nrep->attributeIsEqual(n, idx); return m_nrep->attributeIsEqual(n, idx);
} }
char* wb_name::segmentsAll(int idx) const throw(wb_error) char* wb_name::segmentsAll(int idx) const
{ {
check(); check();
return m_nrep->segmentsAll(idx); return m_nrep->segmentsAll(idx);
} }
char* wb_name::attributesAll(int idx) const throw(wb_error) char* wb_name::attributesAll(int idx) const
{ {
check(); check();
return m_nrep->attributesAll(idx); return m_nrep->attributesAll(idx);
} }
char* wb_name::attributesAllTrue(int idx) const throw(wb_error) char* wb_name::attributesAllTrue(int idx) const
{ {
check(); check();
return m_nrep->attributesAll(idx, 0, true); return m_nrep->attributesAll(idx, 0, true);
} }
// Id representation // Id representation
char* wb_name::vid(char* res) const throw(wb_error) char* wb_name::vid(char* res) const
{ {
check(); check();
return m_nrep->volume(res); return m_nrep->volume(res);
} }
char* wb_name::oix(char* res) const throw(wb_error) char* wb_name::oix(char* res) const
{ {
check(); check();
return m_nrep->segment(1, res); return m_nrep->segment(1, res);
} }
char* wb_name::bodyName(char* res) const throw(wb_error) char* wb_name::bodyName(char* res) const
{ {
check(); check();
return m_nrep->segment(2, res); return m_nrep->segment(2, res);
} }
int wb_name::bodyOffset() const throw(wb_error) int wb_name::bodyOffset() const
{ {
check(); check();
return m_nrep->bodyOffset(); return m_nrep->bodyOffset();
} }
int wb_name::bodySize() const throw(wb_error) int wb_name::bodySize() const
{ {
check(); check();
return m_nrep->bodySize(); return m_nrep->bodySize();
} }
bool wb_name::hasSuper() const throw(wb_error) bool wb_name::hasSuper() const
{ {
check(); check();
return m_nrep->hasSuper(); return m_nrep->hasSuper();
} }
void wb_name::setShadowed(bool shadowed) throw(wb_error) void wb_name::setShadowed(bool shadowed)
{ {
check(); check();
m_nrep->setShadowed(shadowed); m_nrep->setShadowed(shadowed);
......
wb/lib/wb/src/wb_name.h
View file @ 9c1780a8
...@@ -158,45 +158,45 @@ public: ...@@ -158,45 +158,45 @@ public:
bool operator==(wb_name&); bool operator==(wb_name&);
// Name representation // Name representation
bool hasVolume() const throw(wb_error); bool hasVolume() const;
bool hasPath() const throw(wb_error); bool hasPath() const;
bool hasObject() const throw(wb_error); bool hasObject() const;
bool hasSegment(int idx = 0) const throw(wb_error); bool hasSegment(int idx = 0) const;
bool hasAttribute(int idx = 0) const throw(wb_error); bool hasAttribute(int idx = 0) const;
bool hasAttrIndex(int idx = 0) const throw(wb_error); bool hasAttrIndex(int idx = 0) const;
int attributes(); int attributes();
int segments(); int segments();
int attrIndex(int idx = 0) const throw(wb_error); int attrIndex(int idx = 0) const;
char* segment(int idx = 0, char* res = 0) const throw(wb_error); char* segment(int idx = 0, char* res = 0) const;
char* path(char* res = 0) const throw(wb_error); char* path(char* res = 0) const;
char* volume(char* res = 0) const throw(wb_error); char* volume(char* res = 0) const;
char* object(char* res = 0) const throw(wb_error); char* object(char* res = 0) const;
char* attribute(int idx = 0, char* res = 0) const throw(wb_error); char* attribute(int idx = 0, char* res = 0) const;
char* normSegment(int idx = 0, char* res = 0) const throw(wb_error); char* normSegment(int idx = 0, char* res = 0) const;
char* normPath(char* res = 0) const throw(wb_error); char* normPath(char* res = 0) const;
char* normVolume(char* res = 0) const throw(wb_error); char* normVolume(char* res = 0) const;
char* normObject(char* res = 0) const throw(wb_error); char* normObject(char* res = 0) const;
char* normAttribute(int idx = 0, char* res = 0) const throw(wb_error); char* normAttribute(int idx = 0, char* res = 0) const;
char* name() const throw(wb_error); char* name() const;
char* normName() const throw(wb_error); char* normName() const;
char* name(int ntype) const throw(wb_error); char* name(int ntype) const;
char* normName(int ntype) const throw(wb_error); char* normName(int ntype) const;
bool volumeIsEqual(const char* n) const throw(wb_error); bool volumeIsEqual(const char* n) const;
bool objectIsEqual(const char* n) const throw(wb_error); bool objectIsEqual(const char* n) const;
bool segmentIsEqual(const char* n, int idx = 0) const throw(wb_error); bool segmentIsEqual(const char* n, int idx = 0) const;
bool attributeIsEqual(const char* n, int idx = 0) const throw(wb_error); bool attributeIsEqual(const char* n, int idx = 0) const;
char* segmentsAll(int idx = 0) const throw(wb_error); char* segmentsAll(int idx = 0) const;
char* attributesAll(int idx = 0) const throw(wb_error); char* attributesAll(int idx = 0) const;
char* attributesAllTrue(int idx = 0) const throw(wb_error); char* attributesAllTrue(int idx = 0) const;
// Id representation // Id representation
char* vid(char* res = 0) const throw(wb_error); char* vid(char* res = 0) const;
char* oix(char* res = 0) const throw(wb_error); char* oix(char* res = 0) const;
char* bodyName(char* res = 0) const throw(wb_error); char* bodyName(char* res = 0) const;
int bodyOffset() const throw(wb_error); int bodyOffset() const;
int bodySize() const throw(wb_error); int bodySize() const;
bool hasSuper() const throw(wb_error); bool hasSuper() const;
void setShadowed(bool shadowed) throw(wb_error); void setShadowed(bool shadowed);
// bool bodyId(); // bool bodyId();
// bool bodyName(); // bool bodyName();
......
wb/lib/wb/src/wb_nrep.cpp
View file @ 9c1780a8
...@@ -84,14 +84,13 @@ char wb_nrep::unatname_tab[] = "================================" ...@@ -84,14 +84,13 @@ char wb_nrep::unatname_tab[] = "================================"
#define nameDiff(s1, s2) ((long)(s1) - (long)(s2)) #define nameDiff(s1, s2) ((long)(s1) - (long)(s2))
wb_nrep::wb_nrep() wb_nrep::wb_nrep() : m_nRef(0), num_seg(0), num_attr(0), vol_len(0), seg(0),
: m_nRef(0), num_seg(0), num_attr(0), vol_len(0), seg(0), attr(0), attr(0), m_hasSuper(false), m_shadowed(false)
m_hasSuper(false), m_shadowed(false)
{ {
strcpy(oname, ""); strcpy(oname, "");
} }
wb_nrep::wb_nrep(const char* n) throw(wb_error) wb_nrep::wb_nrep(const char* n)
: m_nRef(0), num_seg(0), num_attr(0), vol_len(0), vol_offs(0), b_size(0), : m_nRef(0), num_seg(0), num_attr(0), vol_len(0), vol_offs(0), b_size(0),
b_offset(0), seg(0), attr(0), m_hasSuper(false), m_shadowed(false) b_offset(0), seg(0), attr(0), m_hasSuper(false), m_shadowed(false)
{ {
...@@ -184,7 +183,7 @@ wb_nrep* wb_nrep::ref() ...@@ -184,7 +183,7 @@ wb_nrep* wb_nrep::ref()
return this; return this;
} }
void wb_nrep::parse() throw(wb_error) void wb_nrep::parse()
{ {
int state = 0; int state = 0;
char *s, *snn; char *s, *snn;
......
wb/lib/wb/src/wb_nrep.h
View file @ 9c1780a8
...@@ -88,7 +88,7 @@ private: ...@@ -88,7 +88,7 @@ private:
bool m_hasSuper; bool m_hasSuper;
bool m_shadowed; bool m_shadowed;
void parse() throw(wb_error); void parse();
char* objectName(const char* n, char* res = 0); char* objectName(const char* n, char* res = 0);
char* segmentName(const char* n, int idx = 0, char* res = 0); char* segmentName(const char* n, int idx = 0, char* res = 0);
char* attributeName(const char* n, int idx = 0, char* res = 0); char* attributeName(const char* n, int idx = 0, char* res = 0);
...@@ -101,7 +101,7 @@ public: ...@@ -101,7 +101,7 @@ public:
wb_nrep* ref(); wb_nrep* ref();
wb_nrep(); wb_nrep();
wb_nrep(const char* n) throw(wb_error); wb_nrep(const char* n);
wb_nrep(const wb_nrep& n); wb_nrep(const wb_nrep& n);
~wb_nrep(); ~wb_nrep();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7