aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2011-03-04 22:41:24 -0600
committerJacek Antonelli2011-03-04 22:54:15 -0600
commit59a7c88ecaeb5fbb0873f8aaf081eaa057572806 (patch)
tree2a18a44a55add2999647434ee386220d9a3f3577 /linden/indra
parentSwitched to Phoenix Viewers Boost 1.43 libs for Windows (diff)
downloadmeta-impy-59a7c88ecaeb5fbb0873f8aaf081eaa057572806.zip
meta-impy-59a7c88ecaeb5fbb0873f8aaf081eaa057572806.tar.gz
meta-impy-59a7c88ecaeb5fbb0873f8aaf081eaa057572806.tar.bz2
meta-impy-59a7c88ecaeb5fbb0873f8aaf081eaa057572806.tar.xz
Fixed Linux compile warnings in media_plugin_gstreamer010.cpp.
Warning was because writeToLog expected a char pointer, but was being given string constants. Exact warning message was: deprecated conversion from string constant to ‘char*’
Diffstat (limited to 'linden/indra')
-rwxr-xr-xlinden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 7e2833a..32c4376 100755
--- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -84,7 +84,7 @@ public:
84 GstMessage *message); 84 GstMessage *message);
85 85
86 // basic log file writing 86 // basic log file writing
87 static bool writeToLog(char* str, ...); 87 static bool writeToLog(const char* str, ...);
88 88
89private: 89private:
90 std::string getVersion(); 90 std::string getVersion();
@@ -202,7 +202,7 @@ static char* get_gst_state_name(GstState state)
202#endif // LL_GST_REPORT_STATE_CHANGES 202#endif // LL_GST_REPORT_STATE_CHANGES
203 203
204// static 204// static
205bool MediaPluginGStreamer010::writeToLog(char* str, ...) 205bool MediaPluginGStreamer010::writeToLog(const char* str, ...)
206{ 206{
207 LLFILE* fp = LLFile::fopen("media_plugin_gstreamer010.log", "a"); 207 LLFILE* fp = LLFile::fopen("media_plugin_gstreamer010.log", "a");
208 208