*** empty log message ***

pandatool/src/bam/Sources.pp

@@ -1,11 +1,11 @@
 #begin bin_target
   #define TARGET bam-info
   #define LOCAL_LIBS \
-    eggbase progbase
+    progbase
   #define OTHER_LIBS \
     cull:c loader:c egg:c sgraphutil:c sgattrib:c sgraph:c pnmimagetypes:c \
     graph:c putil:c express:c panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dconfig:c dtool:m pystub
+    interrogatedb:c dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m
 
@@ -24,7 +24,7 @@
     loader:c egg2sg:c builder:c egg:c pnmimagetypes:c gobj:c \
     chan:c graph:c putil:c \
     express:c pandaegg:m panda:m pandaexpress:m \
-    interrogatedb:c dtoolutil:c dconfig:c dtool:m pystub
+    interrogatedb:c dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m
 

pandatool/src/cvscopy/cvsCopy.cxx

@@ -7,6 +7,7 @@
 #include "cvsSourceDirectory.h"
 
 #include <notify.h>
+#include <algorithm>
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CVSCopy::Constructor
@@ -158,7 +159,7 @@ handle_args(Args &args) {
     return false;
   }
 
-  _source_files.insert(_source_files.end(), args.begin(), args.end());
+  copy(args.begin(), args.end(), back_inserter<vector_string>(_source_files));
   return true;
 }
 

pandatool/src/egg-mkfont/Sources.pp

@@ -3,7 +3,7 @@
 #define OTHER_LIBS \
   pnmimagetypes:c pnmimage:c \
   egg:c linmath:c putil:c express:c pandaegg:m panda:m pandaexpress:m \
-  dtoolutil:c dconfig:c dtool:m pystub
+  dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
 
 #define UNIX_SYS_LIBS m
 

pandatool/src/egg-mkfont/charBitmap.cxx

@@ -5,6 +5,8 @@
 
 #include "charBitmap.h"
 
+#include <notify.h>
+
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CharBitmap::Constructor
@@ -40,7 +42,7 @@ bool CharBitmap::
 paint(bool black, int num_pixels, int &repeat) {
   if (_y < _block.size()) {
     while (num_pixels > 0 && _y < _block.size()) {
-      assert(_x < _block[_y].size());
+      nassertr(_x < _block[_y].size(), true);
       _block[_y][_x] = black;
       _x++;
       if (_x >= _block[_y].size()) {

pandatool/src/egg-mkfont/eggMakeFont.cxx

@@ -748,21 +748,21 @@ run() {
 
   // All done!  Write everything out.
   nout << "Scale factor is " << _scale_factor << "\n";
-  PNMImage small(_output_xsize, _output_ysize, _output_zsize);
-  small.gaussian_filter_from(_gaussian_radius, _output_image);
+  PNMImage small_image(_output_xsize, _output_ysize, _output_zsize);
+  small_image.gaussian_filter_from(_gaussian_radius, _output_image);
   
   // Fix antialiasing, if required.
   if (_use_alpha && _bg[3] != 0.0 && _bg[3] != 1.0) {
     // If we have some non-transparent background, we need to
     // compensate for the antialiasing.
-    unsmooth_rgb(small);
+    unsmooth_rgb(small_image);
   }
 
 
   nout << "Generating " << _output_xsize << " by " << _output_ysize
        << " by " << _output_zsize << " image: "
        << _output_image_filename << "\n";  
-  small.write(_output_image_filename);
+  small_image.write(_output_image_filename);
 
   write_egg_file();
 }

pandatool/src/egg-mkfont/pkFontFile.cxx

@@ -816,7 +816,7 @@ do_pre() {
   int comment_len = fetch_byte();
 
   assert(_p + comment_len <= (int)_pk.size());
-  nout.write(&_pk[_p], comment_len);
+  nout.write((const char *)&_pk[_p], comment_len);
   nout << "\n";
   _p += comment_len;
 

pandatool/src/egg-palettize/Sources.pp

@@ -5,7 +5,7 @@
   #define OTHER_LIBS \
     egg:c loader:c linmath:c putil:c express:c pnmimage:c pnmimagetypes:c \
     pandaegg:m panda:m pandaexpress:m \
-    dtoolutil:c dconfig:c dtool:m pystub
+    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m
 

pandatool/src/egg-palettize/paletteGroup.cxx

@@ -117,7 +117,7 @@ get_groups() const {
 ////////////////////////////////////////////////////////////////////
 void PaletteGroup::
 get_placements(vector<TexturePlacement *> &placements) const {
-  Placements::iterator pi;
+  Placements::const_iterator pi;
   for (pi = _placements.begin(); pi != _placements.end(); ++pi) {
     placements.push_back(*pi);
   }
@@ -388,7 +388,7 @@ write_image_info(ostream &out, int indent_level) const {
     page->write_image_info(out, indent_level);
   }
 
-  Placements::iterator pli;
+  Placements::const_iterator pli;
   for (pli = _placements.begin(); pli != _placements.end(); ++pli) {
     TexturePlacement *placement = (*pli);
     if (placement->get_omit_reason() != OR_none) {

pandatool/src/egg-palettize/paletteGroups.h

@@ -25,8 +25,10 @@ private:
   typedef set<PaletteGroup *> Groups;
 
 public:
+#ifndef WIN32_VC
   typedef Groups::const_pointer pointer;
   typedef Groups::const_pointer const_pointer;
+#endif
   typedef Groups::const_reference reference;
   typedef Groups::const_reference const_reference;
   typedef Groups::const_iterator iterator;

pandatool/src/eggprogs/Sources.pp

@@ -2,7 +2,7 @@
   eggbase progbase
 #define OTHER_LIBS \
   egg:c linmath:c putil:c express:c pandaegg:m panda:m pandaexpress:m \
-  dtoolutil:c dconfig:c dtool:m pystub
+  dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
 #define UNIX_SYS_LIBS m
 
 #begin bin_target

pandatool/src/eggprogs/eggTextureCards.cxx

@@ -11,6 +11,8 @@
 #include <eggTexture.h>
 #include <eggPolygon.h>
 
+#include <algorithm>
+
 ////////////////////////////////////////////////////////////////////
 //     Function: EggTextureCards::Constructor
 //       Access: Public
@@ -68,7 +70,8 @@ handle_args(ProgramBase::Args &args) {
     return false;
   }
 
-  _texture_names.insert(_texture_names.end(), args.begin(), args.end());
+  copy(args.begin(), args.end(),
+       back_inserter<vector_string>(_texture_names));
 
   return true;
 }

pandatool/src/flt/Sources.pp

@@ -2,7 +2,7 @@
   #define TARGET flt
   #define LOCAL_LIBS pandatoolbase
   #define OTHER_LIBS \
-    mathutil:c linmath:c putil:c express:c panda:m dtool
+    mathutil:c linmath:c putil:c express:c panda:m dtoolconfig dtool
   #define UNIX_SYS_LIBS \
     m
 
@@ -61,7 +61,7 @@
     flt
   #define OTHER_LIBS \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtool:m pystub
+    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     test_flt.cxx

pandatool/src/flt/fltRecord.cxx

@@ -298,13 +298,13 @@ set_comment(const string &comment) {
 //               exactly the sort of thing we expect.
 ////////////////////////////////////////////////////////////////////
 void FltRecord::
-check_remaining_size(const DatagramIterator &iterator) const {
-  if (iterator.get_remaining_size() == 0) {
+check_remaining_size(const DatagramIterator &di) const {
+  if (di.get_remaining_size() == 0) {
     return;
   }
 
   if (_header->get_flt_version() <= _header->max_flt_version()) {
-    nout << "Warning!  Ignoring extra " << iterator.get_remaining_size()
+    nout << "Warning!  Ignoring extra " << di.get_remaining_size()
 	 << " bytes at the end of a " << get_type() << " record.\n";
   }
 }

pandatool/src/flt/fltRecord.h

@@ -58,7 +58,7 @@ public:
   void clear_comment();
   void set_comment(const string &comment);
 
-  void check_remaining_size(const DatagramIterator &iterator) const;
+  void check_remaining_size(const DatagramIterator &di) const;
 
   virtual void output(ostream &out) const;
   virtual void write(ostream &out, int indent_level = 0) const;

pandatool/src/fltprogs/Sources.pp

@@ -5,7 +5,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtool:m pystub
+    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     fltCopy.cxx fltCopy.h

pandatool/src/gtk-stats/Sources.pp

@@ -9,7 +9,7 @@
     gtkbase progbase pstatserver
   #define OTHER_LIBS \
     pstatclient:c linmath:c putil:c express:c panda:m \
-    dtoolutil:c dconfig:c dtool:m
+    dtoolutil:c dconfig:c dtoolconfig:m dtool:m
   #define UNIX_SYS_LIBS \
     m
 

pandatool/src/imageprogs/Sources.pp

@@ -6,7 +6,7 @@
     imagebase progbase
   #define OTHER_LIBS \
     pnmimagetypes:c pnmimage:c putil:c express:c panda:m \
-    pandaexpress:m dtool pystub
+    pandaexpress:m dtoolconfig dtool pystub
   #define UNIX_SYS_LIBS \
     m
 

pandatool/src/softprogs/Sources.pp

@@ -5,7 +5,7 @@
   #define OTHER_LIBS \
     linmath:c panda:m \
     express:c pandaexpress:m \
-    dtoolutil:c dconfig:c dtool:m pystub
+    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     softCVS.cxx softCVS.h softFilename.cxx softFilename.h

pandatool/src/softprogs/softCVS.cxx

@@ -456,10 +456,10 @@ scan_scene_file(istream &in) {
       SoftFilename v("", word);
 
       // Increment the use count on all matching elements of the multiset.
-      pair<set<SoftFilename>::iterator, set<SoftFilename>::iterator> range;
+      pair<ElementFiles::iterator, ElementFiles::iterator> range;
       range = _element_files.equal_range(v);
 
-      set<SoftFilename>::iterator ei;
+      ElementFiles::iterator ei;
       for (ei = range.first; ei != range.second; ++ei) {
 	// We cheat and get a non-const reference to the filename out
 	// of the set.  We can safely do this because incrementing the

pandatool/src/stitch/Sources.pp

@@ -3,7 +3,7 @@
   #define LOCAL_LIBS \
     stitchbase progbase
   #define OTHER_LIBS \
-    linmath:c putil:c express:c panda:m pandaexpress:m pystub dtool
+    linmath:c putil:c express:c panda:m pandaexpress:m pystub dtoolconfig dtool
 
   #define SOURCES \
     stitchCommandProgram.cxx stitchCommandProgram.h
@@ -18,7 +18,7 @@
     stitchbase progbase
   #define OTHER_LIBS \
     pnmimagetypes:c pnmimage:c linmath:c putil:c express:c panda:m \
-    pandaexpress:m pystub dtool
+    pandaexpress:m pystub dtoolconfig dtool
 
   #define SOURCES \
     stitchImageProgram.cxx stitchImageProgram.h
@@ -34,7 +34,7 @@
     event:c chancfg:c display:c sgraphutil:c light:c \
     pnmimagetypes:c pnmimage:c putil:c express:c \
     panda:m pandaexpress:m \
-    dtoolutil:c dconfig:c dtool:m pystub
+    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
 
   #define SOURCES \
     stitchViewerProgram.cxx stitchViewerProgram.h

pandatool/src/text-stats/Sources.pp

@@ -7,7 +7,7 @@
     progbase pstatserver
   #define OTHER_LIBS \
     pstatclient:c linmath:c putil:c express:c panda:m pandaexpress:m \
-    dtoolutil:c dconfig:c dtool:m pystub
+    dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
   #define UNIX_SYS_LIBS \
     m