[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.4,1.5
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.4,1.5 |
Date: |
21 Jun 2002 07:45:38 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv17968/src/editor
Modified Files:
object_manager.cxx
Log Message:
Some include fixes for win32
Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- object_manager.cxx 20 Jun 2002 15:57:38 -0000 1.4
+++ object_manager.cxx 21 Jun 2002 07:45:35 -0000 1.5
@@ -44,17 +44,17 @@
return a->get_z_pos () < b->get_z_pos ();
}
-#ifdef WIN32
+// #ifdef WIN32
//FIXME: ingo: This is a workaround around the std::list::sort()
//FIXME: problem under MSVC6. This is copy&paste from an usenet
//FIXME: article, so it might work or not, never tested it.
-typedef boost::shared_ptr<EditorObj>& CEditorObjPtr;
-template<>
-bool std::greater<CEditorObjPtr>::operator()(shared_ptr<EditorObj>& a,
shared_ptr<EditorObj>& b) const
-{
- return EditorObj_z_pos_sorter (a, b);
-}
-#endif
+// typedef boost::shared_ptr<EditorObj>& CEditorObjPtr;
+// template<>
+// bool std::greater<CEditorObjPtr>::operator()(shared_ptr<EditorObj>& a,
shared_ptr<EditorObj>& b) const
+//{
+// return EditorObj_z_pos_sorter (a, b);
+//}
+//#endif
ObjectManager::ObjectManager()
{
@@ -178,14 +178,15 @@
editor_objs.insert(editor_objs.end(), temp.begin(), temp.end() );
}
-#ifdef WIN32
+// #ifdef WIN32
//FIXME: ingo: This is a workaround around the std::list::sort()
//FIXME: problem under MSVC6. This is copy&paste from an usenet
//FIXME: article, so it might work or not, never tested it.
- world_obj.sort(std::greater<CWorldObjPtr>());
-#else
- editor_objs.sort(EditorObj_z_pos_sorter);
-#endif
+// Alpha notes that this does NOT work.
+// world_obj.sort(std::greater<CWorldObjPtr>());
+// #else
+// editor_objs.sort(EditorObj_z_pos_sorter);
+// #endif
std::cout << "Reading props" << std::endl;
description = plf->get_description();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.4,1.5,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds starfield_background.cxx,1.2,1.3
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.2,1.3 faller.cxx,1.2,1.3
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds starfield_background.cxx,1.2,1.3
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.2,1.3 faller.cxx,1.2,1.3
- Index(es):