Commit 0966a656 authored by hybrid's avatar hybrid

Remove exceptions from irrMap.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2473 dfc29bdd-3216-0410-991c-e03cc46cb475
parent ba58d26f
...@@ -186,8 +186,7 @@ class map ...@@ -186,8 +186,7 @@ class map
Node& operator* () Node& operator* ()
{ {
if (atEnd()) _IRR_DEBUG_BREAK_IF(atEnd()) // access violation
throw "Iterator at end";
return *Cur; return *Cur;
} }
...@@ -336,8 +335,8 @@ class map ...@@ -336,8 +335,8 @@ class map
Node& operator* () Node& operator* ()
{ {
if (atEnd()) _IRR_DEBUG_BREAK_IF(atEnd()) // access violation
throw "ParentFirstIterator at end";
return *getNode(); return *getNode();
} }
...@@ -436,8 +435,8 @@ class map ...@@ -436,8 +435,8 @@ class map
Node& operator* () Node& operator* ()
{ {
if (atEnd()) _IRR_DEBUG_BREAK_IF(atEnd()) // access violation
throw "ParentLastIterator at end";
return *getNode(); return *getNode();
} }
private: private:
...@@ -483,7 +482,7 @@ class map ...@@ -483,7 +482,7 @@ class map
// myTree["Foo"] = 32; // myTree["Foo"] = 32;
// If "Foo" already exists update its value else insert a new element. // If "Foo" already exists update its value else insert a new element.
// int i = myTree["Foo"] // int i = myTree["Foo"]
// If "Foo" exists return its value, else throw an exception. // If "Foo" exists return its value.
class AccessClass class AccessClass
{ {
// Let map be the only one who can instantiate this class. // Let map be the only one who can instantiate this class.
...@@ -504,8 +503,7 @@ class map ...@@ -504,8 +503,7 @@ class map
Node* node = Tree.find(Key); Node* node = Tree.find(Key);
// Not found // Not found
if (node==0) _IRR_DEBUG_BREAK_IF(node==0) // access violation
throw "Item not found";
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX; _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return node->getValue(); return node->getValue();
......
...@@ -49,7 +49,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ ...@@ -49,7 +49,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
#Compiler flags #Compiler flags
CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1 CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
CXXFLAGS = -Wall -pipe CXXFLAGS = -Wall -pipe -fno-exceptions -fno-rtti
ifndef NDEBUG ifndef NDEBUG
CXXFLAGS += -g -D_DEBUG CXXFLAGS += -g -D_DEBUG
else else
......
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