Changeset 782 for code/branches/FICN/src/orxonox

Timestamp:

Jan 1, 2008, 2:00:08 PM (17 years ago)

Author:

rgrieder

Message:

• removed warnings on msvc compiler
• on msvc: loader is now built with orxonox, not as a separate library

Location:

code/branches/FICN/src/orxonox

Files:

• Orxonox.cc (modified) (1 diff)
• OrxonoxPlatform.h (modified) (2 diffs)
• core/Language.cc (modified) (2 diffs)
• objects/Model.cc (modified) (1 diff)

code/branches/FICN/src/orxonox/Orxonox.cc

@@ -282 +282 @@
       COUT(3) << "Info: network framelistener added" << std::endl;
     }
-    catch(std::exception &e)
+    catch(...)
     {
       COUT(1) << "Error: There was a problem initialising the server :(" << std::endl;

code/branches/FICN/src/orxonox/OrxonoxPlatform.h

@@ -211 +211 @@
 
 // disable: "conversion from 'double' to 'float', possible loss of data
-#   pragma warning (disable : 4244)
+//#   pragma warning (disable : 4244)
 
 // disable: "conversion from 'size_t' to 'unsigned int', possible loss of data
-#   pragma warning (disable : 4267)
+//#   pragma warning (disable : 4267)
 
 // disable: "truncation from 'double' to 'float'
@@ -221 +221 @@
 // disable: "<type> needs to have dll-interface to be used by clients'
 // Happens on STL member variables which are not public therefore is ok
-#   pragma warning (disable : 4251)
+//#   pragma warning (disable : 4251)
 
 // disable: "non dll-interface class used as base for dll-interface class"

code/branches/FICN/src/orxonox/core/Language.cc

@@ -245 +245 @@
             if (lineString.compare("") != 0)
             {
-                unsigned int pos = (unsigned int)lineString.find('=');
+                unsigned int pos = lineString.find('=');
 
                 // Check if the length is at least 3 and if there's an entry before and behind the =
@@ -288 +288 @@
             if (lineString.compare("") != 0)
             {
-                unsigned int pos = (unsigned int)lineString.find('=');
+                unsigned int pos = lineString.find('=');
 
                 // Check if the length is at least 3 and if there's an entry before and behind the =

code/branches/FICN/src/orxonox/objects/Model.cc

@@ -69 +69 @@
 
     void Model::registerAllVariables(){
-      registerVar(&meshSrc_, (int)meshSrc_.length() + 1, network::STRING);
+      registerVar(&meshSrc_, meshSrc_.length() + 1, network::STRING);
     }
 }